* automake.in (scan_autoconf_config_files): Warn about leading

`./' in config file names.
* tests/canon-name.test: New test.
* tests/Makefile.am: Update.
* THANKS: Update.
Suggestion by Claudio Fontana.

diff --git a/ChangeLog b/ChangeLog
index d76393b8b77d69d75aaf03d846c062f346f6deb4..d9da62523b9fd0b4d46b49f993420cfa9c6d9d37 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2007-03-28  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
+       * automake.in (scan_autoconf_config_files): Warn about leading
+       `./' in config file names.
+       * tests/canon-name.test: New test.
+       * tests/Makefile.am: Update.
+       * THANKS: Update.
+       Suggestion by Claudio Fontana.
+
        * tests/yacc6.test: Add the generated headers to `BUILT_SOURCES'
        as documented in the manual.  Fixes parallel make failure.
        Report by Dieter Jurzitza.

diff --git a/Makefile.in b/Makefile.in
index ad3d4907cccc78b963a439ef6ae1f52acd96ad88..e2cd6067d15f2cb4067756334a6dd37287e89932 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -2,7 +2,7 @@
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.

diff --git a/THANKS b/THANKS
index 0da89a4d4168011420aedfca031f1696d18d17c5..a5cf27b4dedbf49f32ffc390e676e93fe2293a69 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -48,6 +48,7 @@ Bruno Haible          haible@ilog.fr
 Charles Wilson         cwilson@ece.gatech.edu
 Chris Provenzano       proven@io.proven.org
 Christian Cornelssen   ccorn@cs.tu-berlin.de
+Claudio Fontana                sick_soul@yahoo.it
 Clifford Wolf          clifford@clifford.at
 Dalibor Topic          robilad@kaffe.org
 danbp                  danpb@nospam.postmaster.co.uk

diff --git a/automake.in b/automake.in
index 730b3710e53c5e4349d8e424ecad4ce1090f7cb1..8d1fc7907dc494724c34b1497d82fc1eb2ad8587 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -7,7 +7,7 @@ eval 'case $# in 0) exec @PERL@ -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac'
 
 # automake - create Makefile.in from Makefile.am
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007  Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -246,7 +246,7 @@ my %standard_prefix =
 # Copyright on generated Makefile.ins.
 my $gen_copyright = "\
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -4753,6 +4753,10 @@ sub scan_autoconf_config_files ($$)
       # Handle $local:$input syntax.
       my ($local, @rest) = split (/:/);
       @rest = ("$local.in",) unless @rest;
+      msg ('portability', $where,
+         "Omit leading `./' from config file names such as `$local',"
+         . "\nas not all make implementations treat `file' and `./file' equally.")
+       if ($local =~ /^\.\//);
       my $input = locate_am @rest;
       if ($input)
         {

diff --git a/doc/Makefile.in b/doc/Makefile.in
index d08ca3be2039b6dd1fb13c230accad19e1fc3e38..6c1e4b6cd74eaf20cd77835010cea34ea6042582 100644 (file)
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -2,7 +2,7 @@
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.

diff --git a/lib/Automake/Makefile.in b/lib/Automake/Makefile.in
index 55095eef70df7592bc2ad7227af1a95f6c0993eb..5c7f96056114e590eb9001c09420282741276ed8 100644 (file)
--- a/lib/Automake/Makefile.in
+++ b/lib/Automake/Makefile.in
@@ -2,7 +2,7 @@
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.

diff --git a/lib/Automake/tests/Makefile.in b/lib/Automake/tests/Makefile.in
index 2a4e8f0519afe5dfb4def661ed28fb27114baa8f..836facfaec78795033b76c074dcc7dacece31de8 100644 (file)
--- a/lib/Automake/tests/Makefile.in
+++ b/lib/Automake/tests/Makefile.in
@@ -2,7 +2,7 @@
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.

diff --git a/lib/Makefile.in b/lib/Makefile.in
index cccebadb1562a498fc2bda69047bd22a0f9e297f..9a97c45d2a2f27d17686fc645aa8f073cb8b3273 100644 (file)
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -2,7 +2,7 @@
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.

diff --git a/lib/am/Makefile.in b/lib/am/Makefile.in
index 92a95e089a647266bbbe6bb3e463246c70b102b7..d895e6c5f7d5340ff97b76da37f5435543df2a72 100644 (file)
--- a/lib/am/Makefile.in
+++ b/lib/am/Makefile.in
@@ -2,7 +2,7 @@
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.

diff --git a/m4/Makefile.in b/m4/Makefile.in
index ef93d6b16d1d04f16a1d6184c595ef127f62e359..21181eb6d5d5b50c7f6056ed7b0c3d4052c40d94 100644 (file)
--- a/m4/Makefile.in
+++ b/m4/Makefile.in
@@ -2,7 +2,7 @@
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 508d68849aaec418848d1ec0fabe49c2571381e4..1177fc72d66d079cfc572b5ae18c3f08fc77192d 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -78,6 +78,7 @@ canon2.test \
 canon3.test \
 canon4.test \
 canon5.test \
+canon-name.test \
 ccnoco.test \
 ccnoco2.test \
 check.test \

diff --git a/tests/Makefile.in b/tests/Makefile.in
index 6bd2fec55873e80dea69da41a8904dfbf20aa0df..9a895a810e850ba9a8de904a4b8c6eb409579bf1 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -2,7 +2,7 @@
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -211,6 +211,7 @@ canon2.test \
 canon3.test \
 canon4.test \
 canon5.test \
+canon-name.test \
 ccnoco.test \
 ccnoco2.test \
 check.test \

diff --git a/tests/canon-name.test b/tests/canon-name.test
new file mode 100755 (executable)
index 0000000..9d97c28
--- /dev/null
+++ b/tests/canon-name.test
@@ -0,0 +1,39 @@
+#! /bin/sh
+# Copyright (C) 2007  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., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
+
+# PR 511: Make sure we warn about AC_CONFIG_FILES([./makefile]).
+
+. ./defs || exit 1
+
+cat > configure.in << 'END'
+AC_INIT([canon-name], [1.0])
+AM_INIT_AUTOMAKE
+AC_CONFIG_FILES([./gmakefile ./sub/gmakefile])
+AC_OUTPUT
+END
+
+mkdir sub
+echo 'SUBDIRS = sub' >gmakefile.am
+: >sub/gmakefile.am
+
+$ACLOCAL
+AUTOMAKE_fails
+grep 'leading.*\./.*\./gmakefile' stderr
+grep 'leading.*\./.*\./sub/gmakefile' stderr