From 377de806b6a5a5cea9d4d33ba1312dc701e5a011 Mon Sep 17 00:00:00 2001 From: Alexandre Duret-Lutz Date: Thu, 30 Jun 2005 22:23:12 +0000 Subject: [PATCH] * automake.in (make_paragraphs): Do not define %TOPDIR%, now that lib/am/header-vars.am no longer uses it. * lib/am/libtool.am (distclean-am, distclean-libtool): Define if TOPDIR_P is true, not TOPDIR. Suggested by Stepan Kasal. --- ChangeLog | 6 ++++++ automake.in | 1 - lib/am/libtool.am | 8 ++++---- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 852cbd52d..e11d48e7c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 2005-06-30 Alexandre Duret-Lutz + * automake.in (make_paragraphs): Do not define %TOPDIR%, now that + lib/am/header-vars.am no longer uses it. + * lib/am/libtool.am (distclean-am, distclean-libtool): Define + if TOPDIR_P is true, not TOPDIR. + Suggested by Stepan Kasal. + * automake.in (read_am_file): Correctly diagnose comments following trailing backslash. * tests/commen10.test: New file. diff --git a/automake.in b/automake.in index 3ea78e5b8..700e7e8b7 100755 --- a/automake.in +++ b/automake.in @@ -6369,7 +6369,6 @@ sub make_paragraphs ($%) 'CK-NEWS' => !! option 'check-news', 'SUBDIRS' => !! var ('SUBDIRS'), - 'TOPDIR' => backname ($relative_dir), 'TOPDIR_P' => $relative_dir eq '.', 'BUILD' => ($seen_canonical >= AC_CANONICAL_BUILD), diff --git a/lib/am/libtool.am b/lib/am/libtool.am index df97a55f3..1c6e0a785 100644 --- a/lib/am/libtool.am +++ b/lib/am/libtool.am @@ -1,5 +1,5 @@ ## automake - create Makefile.in from Makefile.am -## Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2001, 2003 +## Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2001, 2003, 2005 ## Free Software Foundation, Inc. ## This program is free software; you can redistribute it and/or modify @@ -26,6 +26,6 @@ clean-am: clean-libtool clean-libtool: ?LTRMS?%LTRMS% -?TOPDIR?distclean-am: distclean-libtool -?TOPDIR?distclean-libtool: -?TOPDIR? -rm -f libtool +?TOPDIR_P?distclean-am: distclean-libtool +?TOPDIR_P?distclean-libtool: +?TOPDIR_P? -rm -f libtool -- 2.34.1