For PR automake/249:

	* tests/Makefile.am (TESTS): Added nodist2.test.
	* tests/nodist2.test: New file

diff --git a/ChangeLog b/ChangeLog
index 12fab1a..f326eb5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2001-12-26  Tom Tromey  <tromey@redhat.com>
+
+       For PR automake/249:
+       * tests/Makefile.am (TESTS): Added nodist2.test.
+       * tests/nodist2.test: New file
+
 2001-12-26  Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
        * m4/multi.m4: Fix quoting in AC_OUTPUT_COMMANDS.

diff --git a/stamp-vti b/stamp-vti
index 70c99e3..1bf0a87 100644 (file)
--- a/stamp-vti
+++ b/stamp-vti
@@ -1,4 +1,4 @@
-@set UPDATED 5 December 2001
+@set UPDATED 6 December 2001
 @set UPDATED-MONTH December 2001
 @set EDITION 1.5c
 @set VERSION 1.5c

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 22b21dd..a457379 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -213,6 +213,7 @@ nobase.test \
 nodep.test \
 nodepcomp.test \
 nodist.test \
+nodist2.test \
 noinst.test \
 noinstdir.test \
 nolink.test \

diff --git a/tests/Makefile.in b/tests/Makefile.in
index d72b426..ecab3a9 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -286,6 +286,7 @@ nobase.test \
 nodep.test \
 nodepcomp.test \
 nodist.test \
+nodist2.test \
 noinst.test \
 noinstdir.test \
 nolink.test \

diff --git a/tests/nodist2.test b/tests/nodist2.test
new file mode 100755 (executable)
index 0000000..fae8462
--- /dev/null
+++ b/tests/nodist2.test
@@ -0,0 +1,23 @@
+#! /bin/sh
+# Test to make sure nodist_noinst_HEADERS work.
+# For PR 249.
+
+. $srcdir/defs || exit 1
+
+cat >> configure.in <<'EOF'
+AC_OUTPUT
+EOF
+
+cat > Makefile.am << 'EOF'
+nodist_noinst_HEADERS = baz.h
+EOF
+
+: > baz.h
+
+set -e
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE -a
+./configure --prefix `pwd`/install
+make install-data

diff --git a/version.texi b/version.texi
index 70c99e3..1bf0a87 100644 (file)
--- a/version.texi
+++ b/version.texi
@@ -1,4 +1,4 @@
-@set UPDATED 5 December 2001
+@set UPDATED 6 December 2001
 @set UPDATED-MONTH December 2001
 @set EDITION 1.5c
 @set VERSION 1.5c