install fix for egcs

diff --git a/ChangeLog b/ChangeLog
index 054ab13..07cc0cb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Apr  3 13:07:58 1998  Tom Tromey  <tromey@cygnus.com>
+
+       * automake.in (scan_one_configure_file): Exclude INSTALL_DATA from
+       configure_vars.  Test instdata.test.
+
 Tue Mar 31 21:07:42 1998  Tom Tromey  <tromey@cygnus.com>
 
        * automake.in (handle_yacc_lex_cxx): Changed to use new version of

diff --git a/TODO b/TODO
index cd3185a..edb20d6 100644 (file)
--- a/TODO
+++ b/TODO
@@ -1,3 +1,6 @@
+* give user more control over -I flags
+  in particular document a way to override the defaults
+
 * something like this fails:
 
        foo = q \

diff --git a/automake.in b/automake.in
index 091ce4c..098957a 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -4273,7 +4273,8 @@ sub scan_one_configure_file
        # FIXME.
        if (/$AC_SUBST_PATTERN/o
            && $1 ne 'ANSI2KNR'
-           && $1 ne 'INSTALL_SCRIPT')
+           && $1 ne 'INSTALL_SCRIPT'
+           && $1 ne 'INSTALL_DATA')
        {
            $configure_vars{$1} = 1;
        }

diff --git a/automake.texi b/automake.texi
index cdca509..ba2e1f0 100644 (file)
--- a/automake.texi
+++ b/automake.texi
@@ -219,7 +219,7 @@ fully GNU standards-compliant, and do not require @code{perl} in order
 to be built.
 
 Mail suggestions and bug reports for Automake to
-@email{automake-bugs@@gnu.ai.mit.edu}.
+@email{automake-bugs@@gnu.org}.
 
 
 @node Generalities, Examples, Introduction, Top

diff --git a/stamp-vti b/stamp-vti
index d075ada..6d4357b 100644 (file)
--- a/stamp-vti
+++ b/stamp-vti
@@ -1,3 +1,3 @@
-@set UPDATED 31 March 1998
+@set UPDATED 3 April 1998
 @set EDITION 1.2h
 @set VERSION 1.2h

diff --git a/tests/ChangeLog b/tests/ChangeLog
index d1e5caa..b418bde 100644 (file)
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,3 +1,8 @@
+Fri Apr  3 13:04:50 1998  Tom Tromey  <tromey@cygnus.com>
+
+       * exdir2.test: New file.
+       * instdata.test: New file.
+
 Wed Mar 25 15:30:39 1998  Tom Tromey  <tromey@cygnus.com>
 
        * badopt.test: new file.

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 704e0ba..ecb83a3 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -30,7 +30,7 @@ install.test libobj7.test objc.test cond3.test cxxcpp.test \
 aclocal.test alpha.test whoami.test unused.test condman.test \
 texinfo5.test aclocali.test texinfo6.test condman2.test colon4.test \
 java.test sinclude.test javaprim.test javasubst.test aclocalii.test \
-lex2.test libobj8.test version3.test
+lex2.test libobj8.test version3.test instdata.test exdir2.test
 
 EXTRA_DIST = defs $(TESTS)
 

diff --git a/tests/Makefile.in b/tests/Makefile.in
index f3d0b3b..5b5ecc3 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -93,7 +93,7 @@ install.test libobj7.test objc.test cond3.test cxxcpp.test \
 aclocal.test alpha.test whoami.test unused.test condman.test \
 texinfo5.test aclocali.test texinfo6.test condman2.test colon4.test \
 java.test sinclude.test javaprim.test javasubst.test aclocalii.test \
-lex2.test libobj8.test version3.test
+lex2.test libobj8.test version3.test instdata.test exdir2.test
 
 EXTRA_DIST = defs $(TESTS)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs

diff --git a/tests/exdir2.test b/tests/exdir2.test
new file mode 100755 (executable)
index 0000000..7dbdfb6
--- /dev/null
+++ b/tests/exdir2.test
@@ -0,0 +1,13 @@
+#! /bin/sh
+
+# Test to make sure undefined directories are invalid.
+
+. $srcdir/defs || exit 1
+
+cat > Makefile.am << 'EOF'
+html_DATA = zot.html
+pkgdata_DATA = qbert
+EOF
+
+$AUTOMAKE && exit 1
+exit 0

diff --git a/tests/instdata.test b/tests/instdata.test
new file mode 100755 (executable)
index 0000000..134ca1c
--- /dev/null
+++ b/tests/instdata.test
@@ -0,0 +1,15 @@
+#! /bin/sh
+
+# Test to see if defining INSTALL_DATA causes problems.  From EGCS
+# list.
+
+. $srcdir/defs || exit 1
+
+echo 'AC_SUBST(INSTALL_DATA)' >> configure.in
+
+: > Makefile.am
+
+$AUTOMAKE || exit 1
+
+(grep '^DATA =' Makefile.in | grep INSTALL_DATA) && exit 1
+exit 0

diff --git a/version.texi b/version.texi
index d075ada..6d4357b 100644 (file)
--- a/version.texi
+++ b/version.texi
@@ -1,3 +1,3 @@
-@set UPDATED 31 March 1998
+@set UPDATED 3 April 1998
 @set EDITION 1.2h
 @set VERSION 1.2h