From: Stefano Lattarini Date: Sat, 11 Aug 2012 09:24:49 +0000 (+0200) Subject: [ng] rename: am__post_remove_distdir -> am.dist.post-remove-distdir X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9c9d1696d6f01aa7dcb921c4a1ab073c77d23a09;p=thirdparty%2Fautomake.git [ng] rename: am__post_remove_distdir -> am.dist.post-remove-distdir * lib/am/distdir.am: Here. * lib/am/distcheck.mk: And here. Signed-off-by: Stefano Lattarini --- diff --git a/lib/am/distcheck.mk b/lib/am/distcheck.mk index 759928a3f..3504dc0f0 100644 --- a/lib/am/distcheck.mk +++ b/lib/am/distcheck.mk @@ -99,7 +99,7 @@ distcheck: dist ## Make sure to remove the dists we created in the test build directory. && rm -rf $(DIST_ARCHIVES) \ && $(MAKE) distcleancheck - $(am__post_remove_distdir) + $(am.dist.post-remove-distdir) @(echo "$(distdir) archives ready for distribution: "; \ list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x' diff --git a/lib/am/distdir.am b/lib/am/distdir.am index 1986fec06..9a4fd138f 100644 --- a/lib/am/distdir.am +++ b/lib/am/distdir.am @@ -95,7 +95,7 @@ am.dist.remove-distdir = \ ## See automake bug#10470. || { sleep 5 && rm -rf "$(distdir)"; }; \ else :; fi -am__post_remove_distdir = $(am.dist.remove-distdir) +am.dist.post-remove-distdir = $(am.dist.remove-distdir) endif %?TOPDIR_P% if %?SUBDIRS% @@ -328,24 +328,24 @@ $(am.chars.empty).PHONY: $(foreach x,$(am.dist.formats),dist-$x) GZIP_ENV = --best dist-gzip: distdir tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz - $(am__post_remove_distdir) + $(am.dist.post-remove-distdir) dist-bzip2: distdir tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2 - $(am__post_remove_distdir) + $(am.dist.post-remove-distdir) dist-lzip: distdir tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz - $(am__post_remove_distdir) + $(am.dist.post-remove-distdir) dist-xz: distdir tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz - $(am__post_remove_distdir) + $(am.dist.post-remove-distdir) dist-zip: distdir rm -f $(distdir).zip zip -rq $(distdir).zip $(distdir) - $(am__post_remove_distdir) + $(am.dist.post-remove-distdir) endif %?TOPDIR_P% @@ -366,7 +366,7 @@ AM_RECURSIVE_TARGETS += dist dist-all endif %?SUBDIRS% dist dist-all: - $(MAKE) $(DIST_TARGETS) am__post_remove_distdir='@:' - $(am__post_remove_distdir) + $(MAKE) $(DIST_TARGETS) am.dist.post-remove-distdir='@:' + $(am.dist.post-remove-distdir) endif %?TOPDIR_P%