From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Fri, 6 Jan 2012 22:37:09 +0000 (+0100)
Subject: dist: distdir not unconditionally removed anymore for xz and lzip
X-Git-Tag: ng-0.5a~57
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=96fef7a389e922d6d9bd949396be4c76ead7f61d;p=thirdparty%2Fautomake.git

dist: distdir not unconditionally removed anymore for xz and lzip

This change fixes automake bug#10444 a.k.a. bug#10448.

The 'dist-xz' and 'dist-lzip' recipes were erroneously using
'$(am__remove_distdir)' instead of '$(am__post_remove_distdir)'
to cleanup the '$(distdir)'; so a "make dist" issued in a package
using (say) gzip and xz compression would have failed to properly
created the gzip tarball, since the distdir was unconditionally
removed by "make dist-xz" upon its completion, instead of being
left populated for the following "make dist-gzip".

The problem with 'dist-xz' was introduced in the merge commit
`v1.11-1142-g47587d1', and the problem with 'dist-lzip' was
introduced in the merge commit `v1.11-1673-gc1b14e9'

* lib/am/distdir.am (dist-xz): Use '$(am__post_remove_distdir)',
not '$(am__remove_distdir)'.
(dist-lzip): Likewise.
---

diff --git a/lib/am/distdir.am b/lib/am/distdir.am
index d8c1a894c..72268cbab 100644
--- a/lib/am/distdir.am
+++ b/lib/am/distdir.am
@@ -353,13 +353,13 @@ dist-bzip2: distdir
 .PHONY: dist-lzip
 dist-lzip: distdir
 	tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz
-	$(am__remove_distdir)
+	$(am__post_remove_distdir)
 
 ?XZ?DIST_ARCHIVES += $(distdir).tar.xz
 .PHONY: dist-xz
 dist-xz: distdir
 	tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
-	$(am__remove_distdir)
+	$(am__post_remove_distdir)
 
 ?COMPRESS?DIST_ARCHIVES += $(distdir).tar.Z
 .PHONY: dist-tarZ