From: Tom Tromey Date: Thu, 25 Sep 1997 04:56:27 +0000 (+0000) Subject: bug fix for bsd/ultrix X-Git-Tag: Release-1-2b~4 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8551a9bd5f1cadf6f250b4686a89969d02943cab;p=thirdparty%2Fautomake.git bug fix for bsd/ultrix --- diff --git a/ChangeLog b/ChangeLog index 6235941eb..6d6b516fd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ Wed Sep 24 16:10:37 1997 Tom Tromey + * Various: Put "-" before each `rm' line. This avoids a bug in + some losing makes (Ultrix, 4.3 BSD). + * automake.in (handle_dist_worker): Correctly handle subdirs that have their own configure.in. From Peter Mattis. diff --git a/Makefile.am b/Makefile.am index 4c6b3a44c..5d47439a1 100644 --- a/Makefile.am +++ b/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/Makefile.in b/Makefile.in index ffd51163e..262b8f848 100644 --- a/Makefile.in +++ b/Makefile.in @@ -410,8 +410,9 @@ distdir: $(DISTFILES) -chmod 777 $(distdir) here=`cd $(top_builddir) && pwd`; \ top_distdir=`cd $(top_distdir) && pwd`; \ + distdir=`cd $(distdir) && pwd`; \ cd $(top_srcdir) \ - && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnits Makefile + && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$distdir --gnits Makefile @for file in $(DISTFILES); do \ d=$(srcdir); \ test -f $(distdir)/$$file \ @@ -515,7 +516,7 @@ installdirs mostlyclean-generic distclean-generic clean-generic \ maintainer-clean-generic clean mostlyclean distclean maintainer-clean -# 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/THANKS b/THANKS index 2c9fcd912..5c5208135 100644 --- a/THANKS +++ b/THANKS @@ -4,6 +4,7 @@ people: "Juergen A. Erhard" "Markus F.X.J. Oberhumer" +"Nelson H. F. Beebe" "Paul D. Smith" Akim Demaille Alexander V. Lukyanov diff --git a/automake.in b/automake.in index 66e2bc223..1dff245b6 100755 --- a/automake.in +++ b/automake.in @@ -2075,7 +2075,7 @@ sub handle_texinfo # How to clean. The funny name is due to --cygnus influence; in # Cygnus mode, `clean-info' is a target that users can use. $output_rules .= "\nmostlyclean-aminfo:\n"; - &pretty_print_rule ("\trm -f", "\t ", @texi_cleans); + &pretty_print_rule ("\t-rm -f", "\t ", @texi_cleans); $output_rules .= ("\nclean-aminfo:\n\ndistclean-aminfo:\n\n" . "maintainer-clean-aminfo:\n\t" # Eww. But how else can we find all the output @@ -2298,7 +2298,7 @@ sub handle_dist_worker # Create dist directory. - $output_rules .= ("\trm -rf \$(distdir)\n" + $output_rules .= ("\t-rm -rf \$(distdir)\n" . "\tmkdir \$(distdir)\n" . "\t-chmod 777 \$(distdir)\n"); } @@ -2525,7 +2525,7 @@ sub handle_dist # it guarantees that the distribution is self-contained by making another # tarfile. distcheck: dist - rm -rf $(distdir) + -rm -rf $(distdir) GZIP=$(GZIP) $(TAR) zxf $(distdir).tar.gz mkdir $(distdir)/=build mkdir $(distdir)/=inst @@ -2545,7 +2545,7 @@ distcheck: dist && $(MAKE) install \\ && $(MAKE) installcheck \\ && $(MAKE) dist - rm -rf $(distdir) + -rm -rf $(distdir) @echo "========================"; \\ echo "$(distdir).tar.gz is ready for distribution"; \\ echo "========================" @@ -3631,13 +3631,13 @@ sub do_one_clean_target . "\t\@echo \"it deletes files that may require special " . "tools to rebuild.\"\n"); - $output_rules .= "\trm -f config.status\n" + $output_rules .= "\t-rm -f config.status\n" if $relative_dir eq '.'; } elsif ($name . $target eq 'distclean') { - $output_rules .= "\trm -f config.status\n"; - $output_rules .= "\trm -f libtool\n" if $seen_libtool; + $output_rules .= "\t-rm -f config.status\n"; + $output_rules .= "\t-rm -f libtool\n" if $seen_libtool; } $output_rules .= "\n"; } @@ -5269,7 +5269,7 @@ sub initialize_global_constants $uninstall_man_format = ' inst=`echo "@MANBASE@" | sed \'$(transform)\'`.@FULLSECT@; \\ - rm -f $(mandir)/man@SECTION@/$$inst + -rm -f $(mandir)/man@SECTION@/$$inst '; # Commonly found files we look for and automatically include in @@ -5333,7 +5333,7 @@ sub initialize_global_constants . "\n"); $dist{'dist-zip'} = "\t" . 'zip -rq $(distdir).zip $(distdir)' . "\n"; $dist{'dist'} = "\t" . 'GZIP=$(GZIP) $(TAR) chozf $(distdir).tar.gz $(distdir)' . "\n"; - $dist_trailer = "\t" . 'rm -rf $(distdir)' . "\n"; + $dist_trailer = "\t" . '-rm -rf $(distdir)' . "\n"; } # (Re)-Initialize per-Makefile.am variables. diff --git a/clean-hdr.am b/clean-hdr.am index 781b6f0c6..e0d117084 100644 --- a/clean-hdr.am +++ b/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/clean-kr.am b/clean-kr.am index bf8c78c15..f7f3f365a 100644 --- a/clean-kr.am +++ b/clean-kr.am @@ -16,7 +16,7 @@ ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA ## 02111-1307, USA. mostlyclean-kr: - rm -f *_.c + -rm -f *_.c clean-kr: diff --git a/clean.am b/clean.am index 86cd50e1b..c89d2d3a4 100644 --- a/clean.am +++ b/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/compile.am b/compile.am index a8ac4a0a9..ea67e7bf6 100644 --- a/compile.am +++ b/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/depend.am b/depend.am index 07dd586b6..284b1e144 100644 --- a/depend.am +++ b/depend.am @@ -52,4 +52,4 @@ clean-depend: distclean-depend: maintainer-clean-depend: - rm -rf .deps + -rm -rf .deps diff --git a/kr-extra.am b/kr-extra.am index 5f347b107..657798806 100644 --- a/kr-extra.am +++ b/kr-extra.am @@ -24,7 +24,7 @@ clean-krextra: ## `clean' should delete it; if `configure' built it, then `distclean' ## should remove it (and if the maintainer built it, then ## maintainer-clean should remove it). - rm -f ansi2knr + -rm -f ansi2knr distclean-krextra: 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@ + diff --git a/library.am b/library.am index a24744895..9132ae6cb 100644 --- a/library.am +++ b/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/libs-clean.am b/libs-clean.am index 0f7f0fa18..262163a97 100644 --- a/libs-clean.am +++ b/libs-clean.am @@ -18,7 +18,7 @@ mostlyclean-@DIR@LIBRARIES: clean-@DIR@LIBRARIES: - test -z "$(@DIR@_LIBRARIES)" || rm -f $(@DIR@_LIBRARIES) + -test -z "$(@DIR@_LIBRARIES)" || rm -f $(@DIR@_LIBRARIES) distclean-@DIR@LIBRARIES: diff --git a/libtool.am b/libtool.am index 512b839be..4d1706f39 100644 --- a/libtool.am +++ b/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/lisp-clean.am b/lisp-clean.am index 94bbcd414..f9904efa0 100644 --- a/lisp-clean.am +++ b/lisp-clean.am @@ -18,7 +18,7 @@ mostlyclean-lisp: clean-lisp: - test -z "$(ELCFILES)" || rm -f $(ELCFILES) + -test -z "$(ELCFILES)" || rm -f $(ELCFILES) distclean-lisp: diff --git a/ltlib-clean.am b/ltlib-clean.am index 384acab42..c7cdcfb99 100644 --- a/ltlib-clean.am +++ b/ltlib-clean.am @@ -18,7 +18,7 @@ mostlyclean-@DIR@LTLIBRARIES: clean-@DIR@LTLIBRARIES: - test -z "$(@DIR@_LTLIBRARIES)" || rm -f $(@DIR@_LTLIBRARIES) + -test -z "$(@DIR@_LTLIBRARIES)" || rm -f $(@DIR@_LTLIBRARIES) distclean-@DIR@LTLIBRARIES: diff --git a/progs-clean.am b/progs-clean.am index e0e4112b8..2b101f08e 100644 --- a/progs-clean.am +++ b/progs-clean.am @@ -18,7 +18,7 @@ mostlyclean-@DIR@PROGRAMS: clean-@DIR@PROGRAMS: - test -z "$(@DIR@_PROGRAMS)" || rm -f $(@DIR@_PROGRAMS) + -test -z "$(@DIR@_PROGRAMS)" || rm -f $(@DIR@_PROGRAMS) distclean-@DIR@PROGRAMS: diff --git a/tags-clean.am b/tags-clean.am index 62c143a60..f169f3542 100644 --- a/tags-clean.am +++ b/tags-clean.am @@ -26,6 +26,6 @@ clean-tags: ## them. The rule is: if the user built it, "distclean" removes it. ## If it is shipped, "maintainer-clean" removes it. distclean-tags: - rm -f TAGS ID + -rm -f TAGS ID maintainer-clean-tags: diff --git a/texi-vers.am b/texi-vers.am index 42e33ead9..baf2ccd51 100644 --- a/texi-vers.am +++ b/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@ +