removing it.
* automake.in (handle_texinfo): Added `cm' and `ov' extensions.
(handle_dist_worker): Make sure distdir is writeable before
removing it.
(initialize_global_constants [$dist_trailer]): Make sure distdir
is writeable before removing it.
* dist.am (distcheck): Make the new source tree read-only before
compiling. Idea from Karl Berry.
1999-11-12 Tom Tromey <tromey@cygnus.com>
+ * Makefile.am (path-check): Make sure distdir is writeable before
+ removing it.
+ * automake.in (handle_texinfo): Added `cm' and `ov' extensions.
+ (handle_dist_worker): Make sure distdir is writeable before
+ removing it.
+ (initialize_global_constants [$dist_trailer]): Make sure distdir
+ is writeable before removing it.
+ * dist.am (distcheck): Make the new source tree read-only before
+ compiling. Idea from Karl Berry.
+
* automake.texi (Gnits): Allow COPYING.LIB again.
* automake.in (check_gnits_standards): Allow COPYING.LIB again.
## of files on stdin, at least.
find . -print | xargs pathchk -p); \
status=$$?; \
- rm -rf $(distdir); \
+ chmod -R a+w $(distdir) > /dev/null 2>&1; rm -rf $(distdir); \
exit $$status
@if $(SHELL) -c 'install-info --version | sed 1q | fgrep -s -v -i debian' >/dev/null 2>&1; then \
list='$(INFO_DEPS)'; \
for file in $$list; do \
- d=$(srcdir); \
- echo " install-info --info-dir=$(DESTDIR)$(infodir) --remove $$d/$$file"; \
- install-info --info-dir=$(DESTDIR)$(infodir) --remove $$d/$$file; \
+ echo " install-info --info-dir=$(DESTDIR)$(infodir) --remove $(DESTDIR)$(infodir)/$$file"; \
+ install-info --info-dir=$(DESTDIR)$(infodir) --remove $(DESTDIR)$(infodir)/$$file; \
done; \
else :; fi
@$(NORMAL_UNINSTALL)
automake.fns automake.pgs automake.ky automake.kys \
automake.ps automake.log automake.pg automake.toc automake.tp \
automake.tps automake.vr automake.vrs automake.op automake.tr \
- automake.cv automake.cn
+ automake.cv automake.cn automake.cm automake.ov
clean-aminfo:
# it guarantees that the distribution is self-contained by making another
# tarfile.
distcheck: dist
- -rm -rf $(distdir)
+ -chmod -R a+w $(distdir) > /dev/null 2>&1; rm -rf $(distdir)
GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(AMTAR) xf -
+ chmod -R a-w $(distdir); chmod a+w $(distdir)
mkdir $(distdir)/=build
mkdir $(distdir)/=inst
+ chmod a-w $(distdir)
dc_install_base=`cd $(distdir)/=inst && pwd` \
&& cd $(distdir)/=build \
&& ../configure --srcdir=.. --prefix=$$dc_install_base \
&& test `find $$dc_install_base -type f -print | wc -l` -le 1 \
&& $(MAKE) $(AM_MAKEFLAGS) dist \
&& $(MAKE) $(AM_MAKEFLAGS) distclean \
+ && rm -f $(distdir).tar.gz \
&& test `find . -type f -print | wc -l` -eq 0
- -rm -rf $(distdir)
+ -chmod -R a+w $(distdir) > /dev/null 2>&1; rm -rf $(distdir)
@banner="$(distdir).tar.gz is ready for distribution"; \
dashes=`echo "$$banner" | sed s/./=/g`; \
echo "$$dashes"; \
! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \
|| chmod -R a+r $(distdir)
$(AMTAR) ch$(AMTARFLAGS)f - $(distdir) | GZIP=$(GZIP_ENV) gzip -c > $(distdir).tar.gz
- -rm -rf $(distdir)
+ -chmod -R a+w $(distdir) > /dev/null 2>&1; rm -rf $(distdir)
dist-all: distdir
-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \
|| chmod -R a+r $(distdir)
$(AMTAR) ch$(AMTARFLAGS)f - $(distdir) | GZIP=$(GZIP_ENV) gzip -c > $(distdir).tar.gz
- -rm -rf $(distdir)
+ -chmod -R a+w $(distdir) > /dev/null 2>&1; rm -rf $(distdir)
distdir: $(DISTFILES)
@if sed 15q $(srcdir)/NEWS | fgrep -e "$(VERSION)" > /dev/null; then :; else \
echo "NEWS not updated; not releasing" 1>&2; \
exit 1; \
fi
- -rm -rf $(distdir)
+ -chmod -R a+w $(distdir) > /dev/null 2>&1; rm -rf $(distdir)
mkdir $(distdir)
here=`cd $(top_builddir) && pwd`; \
top_distdir=`cd $(distdir) && pwd`; \
@for file in $(DISTFILES); do \
d=$(srcdir); \
if test -d $$d/$$file; then \
- cp -pr $$d/$$file $(distdir)/$$file; \
+ cp -pR $$d/$$file $(distdir); \
else \
test -f $(distdir)/$$file \
|| ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-rm -f config.cache config.log stamp-h stamp-h[0-9]*
maintainer-clean-generic:
+ -rm -f Makefile.in
mostlyclean-am: mostlyclean-vti mostlyclean-aminfo mostlyclean-tags \
mostlyclean-generic
(cd $(distdir) && \
find . -print | xargs pathchk -p); \
status=$$?; \
- rm -rf $(distdir); \
+ chmod -R a+w $(distdir) > /dev/null 2>&1; rm -rf $(distdir); \
exit $$status
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# this explicitly because otherwise too many things could be
# removed. In particular the ".log" extension might
# reasonably be used in other contexts by the user.
+ # FIXME: this is really out of control.
foreach $tc_cursor ('aux', 'cp', 'cps', 'dvi', 'fn', 'fns', 'pgs',
'ky', 'kys', 'ps', 'log', 'pg', 'toc', 'tp', 'tps',
- 'vr', 'vrs', 'op', 'tr', 'cv', 'cn')
+ 'vr', 'vrs', 'op', 'tr', 'cv', 'cn', 'cm', 'ov')
{
push (@texi_cleans, $infobase . '.' . $tc_cursor);
}
# Create dist directory.
- $output_rules .= ("\t-rm -rf \$(distdir)\n"
+ $output_rules .= ("\t-chmod -R a+w \$(distdir) > /dev/null 2>&1; rm -rf \$(distdir)\n"
. "\tmkdir \$(distdir)\n");
}
$dist{'dist'} = ("\t"
. '$(AMTAR) ch$(AMTARFLAGS)f - $(distdir) | GZIP=$(GZIP_ENV) gzip -c > $(distdir).tar.gz'
. "\n");
- $dist_trailer = "\t" . '-rm -rf $(distdir)' . "\n";
+ $dist_trailer = "\t" . '-chmod -R a+w $(distdir) > /dev/null 2>&1; rm -rf $(distdir)' . "\n";
}
# (Re)-Initialize per-Makefile.am variables.
# it guarantees that the distribution is self-contained by making another
# tarfile.
distcheck: dist
- -rm -rf $(distdir)
+## Make sure we can remove distdir before trying to remove it.
+ -chmod -R a+w $(distdir) > /dev/null 2>&1; rm -rf $(distdir)
GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(AMTAR) xf -
+## Make the new source tree read-only. Distributions ought to work in
+## this case. However, make the top-level directory writable so we
+## can make our new subdirs.
+ chmod -R a-w $(distdir); chmod a+w $(distdir)
mkdir $(distdir)/=build
mkdir $(distdir)/=inst
+## Undo the write access.
+ chmod a-w $(distdir)
dc_install_base=`cd $(distdir)/=inst && pwd` \
DISTHOOK && $(MAKE) $(AM_MAKEFLAGS) distcheck-hook \
&& cd $(distdir)/=build \
## directory.
&& rm -f $(distdir).tar.gz \
&& test `find . -type f -print | wc -l` -eq 0
- -rm -rf $(distdir)
+ -chmod -R a+w $(distdir) > /dev/null 2>&1; rm -rf $(distdir)
@banner="$(distdir).tar.gz is ready for distribution"; \
dashes=`echo "$$banner" | sed s/./=/g`; \
echo "$$dashes"; \
## of files on stdin, at least.
find . -print | xargs pathchk -p); \
status=$$?; \
- rm -rf $(distdir); \
+ chmod -R a+w $(distdir) > /dev/null 2>&1; rm -rf $(distdir); \
exit $$status
@for file in $(DISTFILES); do \
d=$(srcdir); \
if test -d $$d/$$file; then \
- cp -pr $$d/$$file $(distdir)/$$file; \
+ cp -pR $$d/$$file $(distdir); \
else \
test -f $(distdir)/$$file \
|| ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-rm -f config.cache config.log stamp-h stamp-h[0-9]*
maintainer-clean-generic:
+ -rm -f Makefile.in
mostlyclean-am: mostlyclean-generic
mostlyclean: mostlyclean-am
-@set UPDATED 20 June 1999
+@set UPDATED 12 November 1999
@set EDITION 1.4a
@set VERSION 1.4a
@for file in $(DISTFILES); do \
d=$(srcdir); \
if test -d $$d/$$file; then \
- cp -pr $$d/$$file $(distdir)/$$file; \
+ cp -pR $$d/$$file $(distdir); \
else \
test -f $(distdir)/$$file \
|| ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-rm -f config.cache config.log stamp-h stamp-h[0-9]*
maintainer-clean-generic:
+ -rm -f Makefile.in
mostlyclean-am: mostlyclean-generic
mostlyclean: mostlyclean-am
-@set UPDATED 20 June 1999
+@set UPDATED 12 November 1999
@set EDITION 1.4a
@set VERSION 1.4a