For PR automake/38:

	* symlink2.test: New file.
	* Makefile.am (TESTS): Added symlink2.test.

diff --git a/tests/ChangeLog b/tests/ChangeLog
index 6971680e782894e938d8105302543931cb4b6f49..e7b07a36df0d9d10983d679784263242dabd5e41 100644 (file)
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,5 +1,9 @@
 2000-03-19  Tom Tromey  <tromey@cygnus.com>
 
+       For PR automake/38:
+       * symlink2.test: New file.
+       * Makefile.am (TESTS): Added symlink2.test.
+
        For PR automake/45:
        * defs, acoutnoq.test, texinfo8.test, tagsub.test, subdir2.test,
        subdir.test, scripts.test, remake2.test, remake.test, pr2.test,

diff --git a/tests/Makefile.am b/tests/Makefile.am
index ed45fb01737ea268db2b007a17b6330ad341ed5e..c2283346fb8dd02345085a402659a918f757279f 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -225,6 +225,7 @@ suffix.test \
 suffix2.test \
 suffix3.test \
 symlink.test \
+symlink2.test \
 syntax.test \
 tags.test \
 tagsub.test \

diff --git a/tests/Makefile.in b/tests/Makefile.in
index ec6e958166c7311bd4c01ae5c76280fb90eafa0a..35e51c2ed485fd9c832d07af661a268977877e27 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -294,6 +294,7 @@ suffix.test \
 suffix2.test \
 suffix3.test \
 symlink.test \
+symlink2.test \
 syntax.test \
 tags.test \
 tagsub.test \
@@ -352,11 +353,12 @@ distdir: $(DISTFILES)
        @for file in $(DISTFILES); do \
          d=$(srcdir); \
          if test -d $$d/$$file; then \
-           cp -pR $$d/$$file $(distdir); \
+           cp -pR $$d/$$file $(distdir) \
+           || exit 1; \
          else \
            test -f $(distdir)/$$file \
-           || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-           || cp -p $$d/$$file $(distdir)/$$file || :; \
+           || cp -p $$d/$$file $(distdir)/$$file \
+           || exit 1; \
          fi; \
        done
 check-TESTS: $(TESTS)

diff --git a/tests/symlink2.test b/tests/symlink2.test
new file mode 100755 (executable)
index 0000000..90b8150
--- /dev/null
+++ b/tests/symlink2.test
@@ -0,0 +1,13 @@
+#! /bin/sh
+
+# Test to make sure that `automake -a' redirects dangling symlinks.
+
+. $srcdir/defs || exit 1
+
+rm install-sh
+rm mkinstalldirs
+ln -s Zardoz mkinstalldirs
+
+: > Makefile.am
+
+$AUTOMAKE --add-missing