From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Mon, 23 Apr 2012 18:37:47 +0000 (+0200)
Subject: [ng] dist: remove workaround needed by BSD make only
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=814e32696ca0cdd402624db132dedf0d3379e033;p=thirdparty%2Fautomake.git

[ng] dist: remove workaround needed by BSD make only

* am/lib/configure.am (distcheck): GNU make (without the '.ONESHELL'
special target specified, which we don't support anyway) is assured
not to re-use the same shell in different commands of the same recipe,
so we can slightly simplify our rule accordingly, removing workarounds
that were only relevant fr BSD make when run in parallel mode.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
---

diff --git a/lib/am/distdir.am b/lib/am/distdir.am
index 7374eea63..bb2d2a77a 100644
--- a/lib/am/distdir.am
+++ b/lib/am/distdir.am
@@ -469,9 +469,6 @@ distcheck: dist
 ## create very long directory names.
 	  && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
 ?DISTCHECK-HOOK?	  && $(MAKE) distcheck-hook \
-## Parallel BSD make may not start a new shell for each command in a recipe,
-## so be sure to 'cd' back to the original directory after this.
-	  && am__cwd=`pwd` \
 	  && $(am__cd) $(distdir)/_build \
 	  && ../configure --srcdir=.. --prefix="$$dc_install_base" \
 ?GETTEXT?	    --with-included-gettext \
@@ -511,10 +508,7 @@ distcheck: dist
 	  && $(MAKE) dist \
 ## Make sure to remove the dists we created in the test build directory.
 	  && rm -rf $(DIST_ARCHIVES) \
-	  && $(MAKE) distcleancheck \
-## Cater to parallel BSD make (see above).
-	  && cd "$$am__cwd" \
-	  || exit 1
+	  && $(MAKE) distcleancheck
 	$(am__post_remove_distdir)
 	@(echo "$(distdir) archives ready for distribution: "; \
 	  list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \