Wed Sep 24 16:10:37 1997 Tom Tromey <tromey@cygnus.com>
+ * 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.
## `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; \
-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 \
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; \
"Juergen A. Erhard" <jae@laden.ilk.de>
"Markus F.X.J. Oberhumer" <k3040e4@wildsau.idv-edu.uni-linz.ac.at>
+"Nelson H. F. Beebe" <beebe@math.utah.edu>
"Paul D. Smith" <psmith@BayNetworks.COM>
Akim Demaille <demaille@inf.enst.fr>
Alexander V. Lukyanov <lav@yars.free.net>
# 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
# Create dist directory.
- $output_rules .= ("\trm -rf \$(distdir)\n"
+ $output_rules .= ("\t-rm -rf \$(distdir)\n"
. "\tmkdir \$(distdir)\n"
. "\t-chmod 777 \$(distdir)\n");
}
# 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
&& $(MAKE) install \\
&& $(MAKE) installcheck \\
&& $(MAKE) dist
- rm -rf $(distdir)
+ -rm -rf $(distdir)
@echo "========================"; \\
echo "$(distdir).tar.gz is ready for distribution"; \\
echo "========================"
. "\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";
}
$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
. "\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.
clean-hdr:
distclean-hdr:
- rm -f @FILES@
+ -rm -f @FILES@
maintainer-clean-hdr:
## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
## 02111-1307, USA.
mostlyclean-kr:
- rm -f *_.c
+ -rm -f *_.c
clean-kr:
## -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)
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:
distclean-depend:
maintainer-clean-depend:
- rm -rf .deps
+ -rm -rf .deps
## `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:
## `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; \
clean-hdr:
distclean-hdr:
- rm -f @FILES@
+ -rm -f @FILES@
maintainer-clean-hdr:
## -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)
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:
distclean-depend:
maintainer-clean-depend:
- rm -rf .deps
+ -rm -rf .deps
## 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@
$(LIBTOOL) --mode=compile $(COMPILE) -c $<
mostlyclean-libtool:
- rm -f *.lo
+ -rm -f *.lo
clean-libtool:
- rm -rf .libs
+ -rm -rf .libs
distclean-libtool:
@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@
+
## 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@
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:
$(LIBTOOL) --mode=compile $(COMPILE) -c $<
mostlyclean-libtool:
- rm -f *.lo
+ -rm -f *.lo
clean-libtool:
- rm -rf .libs
+ -rm -rf .libs
distclean-libtool:
mostlyclean-lisp:
clean-lisp:
- test -z "$(ELCFILES)" || rm -f $(ELCFILES)
+ -test -z "$(ELCFILES)" || rm -f $(ELCFILES)
distclean-lisp:
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:
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:
## 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:
@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@
+