automake-ng
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Automake-ng] [PATCH 2/2] [ng] dist: remove workaround needed by BSD mak


From: Stefano Lattarini
Subject: [Automake-ng] [PATCH 2/2] [ng] dist: remove workaround needed by BSD make only
Date: Mon, 23 Apr 2012 23:01:08 +0200

* 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 <address@hidden>
---
 lib/am/distdir.am |    8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/lib/am/distdir.am b/lib/am/distdir.am
index 7374eea..bb2d2a7 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) | \
-- 
1.7.9.5




reply via email to

[Prev in Thread] Current Thread [Next in Thread]