Makefile fixlet

diff --git a/ChangeLog b/ChangeLog
index 9680ebd8ea68ba0a4300121d22ca78254cc662f7..ead89dc9f870d4cd9048cd710f976d90994d2eb5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,8 @@ Fri Feb 13 00:28:53 1998  Tom Tromey  <tromey@cygnus.com>
 
        * Released 1.2e.
 
+       * Makefile.am: Removed bogus line.
+
 Thu Feb 12 22:27:05 1998  Tom Tromey  <tromey@cygnus.com>
 
        * automake.in (get_object_extension): Conditionally include .c.o

diff --git a/Makefile.am b/Makefile.am
index 5d47439a18772b520592198c498832ad2bdc0aeb..b0203864f09281864521673bca3b38bf9bd55ad6 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -30,7 +30,6 @@ TAGS_DEPENDENCIES = automake.in aclocal.in automake.texi
 
 ## `test -x' is not portable.  So we use Perl instead.  If Perl
 ## doesn't exist, then this test is meaningless anyway.
-       -rm -rf testSubdir
 installcheck-local:
        for file in $(pkgdata_SCRIPTS); do \
          $(PERL) -e "exit ! -x '$(pkgdatadir)/$$file';" || exit 1; \

diff --git a/Makefile.in b/Makefile.in
index 692ffa1d794e07cacfec9946857538d89b64071f..f3a76159a27008fbdaa50ad3a56f01435b635751 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -524,7 +524,6 @@ installdirs mostlyclean-generic distclean-generic clean-generic \
 maintainer-clean-generic clean mostlyclean distclean maintainer-clean
 
 
-       -rm -rf testSubdir
 installcheck-local:
        for file in $(pkgdata_SCRIPTS); do \
          $(PERL) -e "exit ! -x '$(pkgdatadir)/$$file';" || exit 1; \

diff --git a/lib/am/Makefile.am b/lib/am/Makefile.am
index 5d47439a18772b520592198c498832ad2bdc0aeb..b0203864f09281864521673bca3b38bf9bd55ad6 100644 (file)
--- a/lib/am/Makefile.am
+++ b/lib/am/Makefile.am
@@ -30,7 +30,6 @@ TAGS_DEPENDENCIES = automake.in aclocal.in automake.texi
 
 ## `test -x' is not portable.  So we use Perl instead.  If Perl
 ## doesn't exist, then this test is meaningless anyway.
-       -rm -rf testSubdir
 installcheck-local:
        for file in $(pkgdata_SCRIPTS); do \
          $(PERL) -e "exit ! -x '$(pkgdatadir)/$$file';" || exit 1; \

diff --git a/tests/ChangeLog b/tests/ChangeLog
index 22bfb0a72591f6c628301aa6548576a959adca56..74459190d68730251b50410fe403d4e8c1c1b1a1 100644 (file)
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,3 +1,7 @@
+Fri Feb 13 00:36:38 1998  Tom Tromey  <tromey@cygnus.com>
+
+       * Makefile.am (distclean-local): Ignore rm return value.
+
 Thu Feb 12 21:00:34 1998  Tom Tromey  <tromey@cygnus.com>
 
        * unused.test: New file.

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 3680561cfe5bb2ec200937af1f4599cc86418163..4b4e770c3a2cf12672b90b9bb45457bd6bd7dd33 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -33,4 +33,4 @@ whoami.test unused.test
 EXTRA_DIST = defs $(TESTS)
 
 distclean-local:
-       rm -rf testSubdir
+       -rm -rf testSubdir

diff --git a/tests/Makefile.in b/tests/Makefile.in
index 804d73fd9a608127e62a94aa2d064687a2bf4b4a..c1d851db9dd5012c9291d46160edcff90a172337 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -210,7 +210,7 @@ maintainer-clean-generic clean mostlyclean distclean maintainer-clean
 
 
 distclean-local:
-       rm -rf testSubdir
+       -rm -rf testSubdir
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.