bug fix for bsd/ultrix

8 files changed, 19 insertions, 18 deletions

diff --git a/lib/am/Makefile.am b/lib/am/Makefile.am
index 4c6b3a44c..5d47439a1 100644
--- a/lib/am/Makefile.am
+++ b/lib/am/Makefile.am
@@ -30,7 +30,7 @@ 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.
-# Check to make sure some installed files are executable.
+	-rm -rf testSubdir
 installcheck-local:
 	for file in $(pkgdata_SCRIPTS); do \
 	  $(PERL) -e "exit ! -x '$(pkgdatadir)/$$file';" || exit 1; \
diff --git a/lib/am/clean-hdr.am b/lib/am/clean-hdr.am
index 781b6f0c6..e0d117084 100644
--- a/lib/am/clean-hdr.am
+++ b/lib/am/clean-hdr.am
@@ -20,6 +20,6 @@ mostlyclean-hdr:
 clean-hdr:
 
 distclean-hdr:
-	rm -f @FILES@
+	-rm -f @FILES@
 
 maintainer-clean-hdr:
diff --git a/lib/am/clean.am b/lib/am/clean.am
index 86cd50e1b..c89d2d3a4 100644
--- a/lib/am/clean.am
+++ b/lib/am/clean.am
@@ -20,16 +20,16 @@
 ## -rf" command looks disturbing.  Also, the Solaris 2.4 "rm" will
 ## return an error if there are no arguments other than "-f".
 mostlyclean-generic:
-	test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
+	-test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
 
 clean-generic:
-	test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 
 distclean-generic:
-	rm -f Makefile $(DISTCLEANFILES)
-	rm -f config.cache config.log stamp-h stamp-h[0-9]*
-	test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-rm -f Makefile $(DISTCLEANFILES)
+	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
-	test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
-	test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
+	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
+	-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
diff --git a/lib/am/compile.am b/lib/am/compile.am
index a8ac4a0a9..ea67e7bf6 100644
--- a/lib/am/compile.am
+++ b/lib/am/compile.am
@@ -20,11 +20,11 @@
 
 mostlyclean-compile:
 ## Don't remove 'core.*' because some distributions have eg "core.c".
-	rm -f *.o core
+	-rm -f *.o core
 
 clean-compile:
 
 distclean-compile:
-	rm -f *.tab.c
+	-rm -f *.tab.c
 
 maintainer-clean-compile:
diff --git a/lib/am/depend.am b/lib/am/depend.am
index 07dd586b6..284b1e144 100644
--- a/lib/am/depend.am
+++ b/lib/am/depend.am
@@ -52,4 +52,4 @@ clean-depend:
 distclean-depend:
 
 maintainer-clean-depend:
-	rm -rf .deps
+	-rm -rf .deps
diff --git a/lib/am/library.am b/lib/am/library.am
index a24744895..9132ae6cb 100644
--- a/lib/am/library.am
+++ b/lib/am/library.am
@@ -16,6 +16,6 @@
 ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 ## 02111-1307, USA.
 @LIBRARY@: $(@XLIBRARY@_OBJECTS) $(@XLIBRARY@_DEPENDENCIES)
-	rm -f @LIBRARY@
+	-rm -f @LIBRARY@
 	$(AR) cru @LIBRARY@ $(@XLIBRARY@_OBJECTS) $(@XLIBRARY@_LIBADD)
 	$(RANLIB) @LIBRARY@
diff --git a/lib/am/libtool.am b/lib/am/libtool.am
index 512b839be..4d1706f39 100644
--- a/lib/am/libtool.am
+++ b/lib/am/libtool.am
@@ -21,10 +21,10 @@
 	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
 
 mostlyclean-libtool:
-	rm -f *.lo
+	-rm -f *.lo
 
 clean-libtool:
-	rm -rf .libs
+	-rm -rf .libs
 
 distclean-libtool:
 
diff --git a/lib/am/texi-vers.am b/lib/am/texi-vers.am
index 42e33ead9..baf2ccd51 100644
--- a/lib/am/texi-vers.am
+++ b/lib/am/texi-vers.am
@@ -31,14 +31,15 @@ stamp-@VTI@: @TEXI@ $(top_srcdir)/configure.in
 	@cmp -s @VTI@.tmp $(srcdir)/stamp-@VTI@ \
 	  || (echo "Updating $(srcdir)/stamp-@VTI@"; \
 	      cp @VTI@.tmp $(srcdir)/stamp-@VTI@)
-	@rm -f @VTI@.tmp
+	-@rm -f @VTI@.tmp
 
 mostlyclean-@VTI@:
-	rm -f @VTI@.tmp
+	-rm -f @VTI@.tmp
 
 clean-@VTI@:
 
 distclean-@VTI@:
 
 maintainer-clean-@VTI@:
-	@MAINT@rm -f stamp-@VTI@ @VTEXI@
+	-@MAINT@rm -f stamp-@VTI@ @VTEXI@
+