Fix for PR automake/389:

* automake.in (handle_configure): Don't put $colon_infile in
CONFIG-MAKEFILE.
* tests/conff.test: New file.
* tests/Makefile.am (TESTS): Add conff.test.
Reported by Alexander Turbov.

diff --git a/ChangeLog b/ChangeLog
index 8463836..b1f6e63 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2003-04-19  Alexandre Duret-Lutz  <adl@gnu.org>
+
+       Fix for PR automake/389:
+       * automake.in (handle_configure): Don't put $colon_infile in
+       CONFIG-MAKEFILE.
+       * tests/conff.test: New file.
+       * tests/Makefile.am (TESTS): Add conff.test.
+       Reported by Alexander Turbov.
+
 2003-04-18  Alexandre Duret-Lutz  <adl@gnu.org>
 
        * tests/defs.in: Handle required=etags to work around

diff --git a/automake.in b/automake.in
index 38e1855..dd7c55d 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -4432,8 +4432,7 @@ sub handle_configure
                      MAKEFILE              => $local_base,
                      'MAKEFILE-DEPS'       => "@rewritten",
                      'CONFIG-MAKEFILE'
-                      => ((($relative_dir eq '.') ? '$@' : '$(subdir)/$@')
-                          . $colon_infile),
+                      => ($relative_dir eq '.') ? '$@' : '$(subdir)/$@',
                      'MAKEFILE-IN'         => $infile,
                      'MAKEFILE-IN-DEPS'    => "@include_stack",
                      'MAKEFILE-AM'         => $amfile,

diff --git a/stamp-vti b/stamp-vti
index d4a9843..12adb46 100644 (file)
--- a/stamp-vti
+++ b/stamp-vti
@@ -1,4 +1,4 @@
-@set UPDATED 14 April 2003
+@set UPDATED 19 April 2003
 @set UPDATED-MONTH April 2003
 @set EDITION 1.7a
 @set VERSION 1.7a

diff --git a/tests/Makefile.am b/tests/Makefile.am
index f8ce5c6..cd0426f 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -114,6 +114,7 @@ condman2.test \
 conf2.test \
 confdeps.test \
 confdist.test \
+conff.test \
 confh.test \
 confh4.test \
 config.test \

diff --git a/tests/Makefile.in b/tests/Makefile.in
index c612ccf..c2a218c 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -217,6 +217,7 @@ condman2.test \
 conf2.test \
 confdeps.test \
 confdist.test \
+conff.test \
 confh.test \
 confh4.test \
 config.test \

diff --git a/tests/conff.test b/tests/conff.test
new file mode 100755 (executable)
index 0000000..56aa066
--- /dev/null
+++ b/tests/conff.test
@@ -0,0 +1,99 @@
+#! /bin/sh
+# Copyright (C) 2003  Free Software Foundation, Inc.
+#
+# This file is part of GNU Automake.
+#
+# GNU Automake is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# GNU Automake is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with Automake; see the file COPYING.  If not, write to
+# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+# Boston, MA 02111-1307, USA.
+
+# Make sure rebuild rules work even when AC_CONFIG_FILES uses colons.
+# Report from Alexander Turbov.
+
+required=GNUmake
+. ./defs || exit 1
+
+set -e
+
+cat >> configure.in << 'END'
+AC_CONFIG_FILES([bar/Makefile:bar/Makefile.in:Makefile.bot])
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+SUBDIRS = bar
+EXTRA_DIST = Makefile.bot
+END
+
+mkdir bar
+cat > bar/Makefile.am << 'END'
+top-rule:
+       @echo 'top rule'
+END
+
+cat > Makefile.bot << 'END'
+bot-rule:
+       @echo 'bot rule'
+END
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE
+./configure
+$MAKE
+
+cd bar
+$MAKE top-rule >stdout
+cat stdout
+grep 'top rule' stdout
+$MAKE bot-rule >stdout
+cat stdout
+grep 'bot rule' stdout
+cd ..
+
+$sleep
+
+cat > bar/Makefile.am << 'END'
+top-rule:
+       @echo 'top2 rule'
+END
+$MAKE
+
+cd bar
+$MAKE top-rule >stdout
+cat stdout
+grep 'top2 rule' stdout
+$MAKE bot-rule >stdout
+cat stdout
+grep 'bot rule' stdout
+cd ..
+
+$sleep
+
+cat > Makefile.bot << 'END'
+bot-rule:
+       @echo 'bot2 rule'
+END
+$MAKE
+
+cd bar
+$MAKE top-rule >stdout
+cat stdout
+grep 'top2 rule' stdout
+$MAKE bot-rule >stdout
+cat stdout
+grep 'bot2 rule' stdout
+cd ..
+
+$MAKE distcheck

diff --git a/version.texi b/version.texi
index d4a9843..12adb46 100644 (file)
--- a/version.texi
+++ b/version.texi
@@ -1,4 +1,4 @@
-@set UPDATED 14 April 2003
+@set UPDATED 19 April 2003
 @set UPDATED-MONTH April 2003
 @set EDITION 1.7a
 @set VERSION 1.7a