>>> "Stepan" == Stepan Kasal <[EMAIL PROTECTED]> writes:
Stepan> The question is: shouldn't the automake "variable" TOPDIR be removed?
Thanks, I'm installing this.
2005-06-30 Alexandre Duret-Lutz <[EMAIL PROTECTED]>
* 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.
Index: automake.in
===================================================================
RCS file: /cvs/automake/automake/automake.in,v
retrieving revision 1.1607
diff -u -r1.1607 automake.in
--- automake.in 30 Jun 2005 21:19:47 -0000 1.1607
+++ automake.in 30 Jun 2005 22:21:40 -0000
@@ -6369,7 +6369,6 @@
'CK-NEWS' => !! option 'check-news',
'SUBDIRS' => !! var ('SUBDIRS'),
- 'TOPDIR' => backname ($relative_dir),
'TOPDIR_P' => $relative_dir eq '.',
'BUILD' => ($seen_canonical >= AC_CANONICAL_BUILD),
Index: lib/am/libtool.am
===================================================================
RCS file: /cvs/automake/automake/lib/am/libtool.am,v
retrieving revision 1.16
diff -u -r1.16 libtool.am
--- lib/am/libtool.am 14 May 2005 20:28:53 -0000 1.16
+++ lib/am/libtool.am 30 Jun 2005 22:21:40 -0000
@@ -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-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
--
Alexandre Duret-Lutz
