>From ecce6d4d386c925d5b58487edc2cdf985b20fda9 Mon Sep 17 00:00:00 2001 Message-Id: In-Reply-To: References: From: Stefano Lattarini Date: Fri, 6 Jan 2012 23:37:09 +0100 Subject: [PATCH 2/2] dist: distdir not unconditionally removed anymore for xz and lzip This change fixes automake bug#10444. 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-1183-g72c8dcb', and the problem with 'dist-lzip' was introduced in the merge commit `xxx' * lib/am/distdir.am (dist-xz): Use '$(am__post_remove_distdir)', not '$(am__remove_distdir)'. (dist-lzip): Likewise. --- lib/am/distdir.am | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/am/distdir.am b/lib/am/distdir.am index d8c1a89..72268cb 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 -- 1.7.7.3