* 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.

diff --git a/ChangeLog b/ChangeLog
index 852cbd52d29d9147aa57a45d648eafc38a9a4ec1..e11d48e7c737611cdf7c7e5f64b9a04765a0c5fa 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2005-06-30  Alexandre Duret-Lutz  <adl@gnu.org>
 
+       * 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 3ea78e5b8d7c8f0caab8610326374de175599d95..700e7e8b7fcc9aeb126a544349e21df807ba5d88 100755 (executable)
--- 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 df97a55f3b9ea7442c4ba6951b7f92fb6cdc83ee..1c6e0a78570aa613e7cff20e3e39f121fae5bcb8 100644 (file)
--- 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