Prefer `$(am__cd)' to plain `cd' in our Makefiles.

* Makefile.am (recheck, dist-hook, git-dist, path-check, fetch)
(release-stats): Use `$(am__cd)' rather than plain `cd'.
* tests/Makefile.am ($(srcdir)/parallel-tests.am): Likewise.

diff --git a/ChangeLog b/ChangeLog
index 9c29305..5ef4d4e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-09-14  Stefano Lattarini  <stefano.lattarini@gmail.com>
+
+       Prefer `$(am__cd)' to plain `cd' in our Makefiles.
+       * Makefile.am (recheck, dist-hook, git-dist, path-check, fetch)
+       (release-stats): Use `$(am__cd)' rather than plain `cd'.
+       * tests/Makefile.am ($(srcdir)/parallel-tests.am): Likewise.
+
 2010-09-12  Stefano Lattarini  <stefano.lattarini@gmail.com>
 
        Fix regression in test `colon4.test'.

diff --git a/Makefile.am b/Makefile.am
index 3dd2a18..167887d 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -111,7 +111,8 @@ recheck:
          esac; \
        done; \
        for subdir in $(TEST_SUBDIRS); do \
-         (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $@) || eval $$failcom; \
+         ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $@) \
+           || eval $$failcom; \
        done; \
        test -z "$$fail"
 
@@ -123,7 +124,7 @@ recheck:
 
 # Ensure tests are world-executable
 dist-hook:
-       cd $(distdir)/tests && chmod a+rx *.test
+       $(am__cd) $(distdir)/tests && chmod a+rx *.test
 
 
 # Perl coverage statistics.
@@ -530,7 +531,7 @@ git-dist: maintainer-check
 ## Finally, if anything was successful, commit the last changes and tag
 ## the release in the repository.  We don't use RCS keywords so it's OK
 ## to distribute the files before they were committed.
-       cd $(srcdir) && git commit -a -s && \
+       $(am__cd) $(srcdir) && git commit -a -s && \
           git tag -s "v$(VERSION)" -m "Release $(VERSION)"
 
 git-release: git-dist
@@ -552,7 +553,7 @@ git-diff:
 
 ## Check our path lengths.
 path-check: distdir
-       (cd $(distdir) && \
+       ($(am__cd) $(distdir) && \
 ## FIXME there's got to be a better way!  pathchk should take the list
 ## of files on stdin, at least.
          find . -print | xargs pathchk -p); \
@@ -584,7 +585,7 @@ fetch:
        rm -rf Fetchdir > /dev/null 2>&1
        mkdir Fetchdir
 ## If a get fails then that is a problem.
-       (cd Fetchdir && \
+       ($(am__cd) Fetchdir && \
        $(WGET_SV_GIT_CF)config.guess -O config.guess && \
        $(WGET_SV_GIT_CF)config.sub -O config.sub && \
        $(WGET_SV_CVS)texinfo/texinfo/doc/texinfo.tex -O texinfo.tex && \
@@ -621,7 +622,7 @@ release-stats: ps
        aml=`cat $$dot_am_files | wc -l` && \
        m4f=`ls -1 $(srcdir)/m4/*.m4 | wc -l` && \
        m4l=`cat $(srcdir)/m4/*.m4 | wc -l` && \
-       doc_text=`cd doc && LC_ALL=C pstops 0 automake.ps unused.ps 2>&1` && \
+       doc_text=`$(am__cd) doc && LC_ALL=C pstops 0 automake.ps unused.ps 2>&1` && \
        echo "$$doc_text" && \
        rm -f doc/unused.ps && \
        doc=`echo "$$doc_text" | sed -n 's/.*Wrote \([1-9][0-9]*\) pages.*/\1/p'` && \

diff --git a/Makefile.in b/Makefile.in
index 3a89eba..7c5c611 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -925,7 +925,8 @@ recheck:
          esac; \
        done; \
        for subdir in $(TEST_SUBDIRS); do \
-         (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $@) || eval $$failcom; \
+         ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $@) \
+           || eval $$failcom; \
        done; \
        test -z "$$fail"
 
@@ -933,7 +934,7 @@ recheck:
 
 # Ensure tests are world-executable
 dist-hook:
-       cd $(distdir)/tests && chmod a+rx *.test
+       $(am__cd) $(distdir)/tests && chmod a+rx *.test
 
 check-coverage-run recheck-coverage-run: all
        $(mkinstalldirs) $(PERL_COVERAGE_DB)
@@ -1239,7 +1240,7 @@ git-dist: maintainer-check
          exit 1;                               \
        fi
        $(MAKE) $(AM_MAKEFLAGS) distcheck
-       cd $(srcdir) && git commit -a -s && \
+       $(am__cd) $(srcdir) && git commit -a -s && \
           git tag -s "v$(VERSION)" -m "Release $(VERSION)"
 
 git-release: git-dist
@@ -1260,7 +1261,7 @@ git-diff:
            > $(PACKAGE)-$$prevno-$(VERSION).diff
 
 path-check: distdir
-       (cd $(distdir) && \
+       ($(am__cd) $(distdir) && \
          find . -print | xargs pathchk -p); \
          estatus=$$?; \
          find $(distdir) -type d '!' -perm -200 -exec chmod u+w {} ';'; \
@@ -1270,7 +1271,7 @@ path-check: distdir
 fetch:
        rm -rf Fetchdir > /dev/null 2>&1
        mkdir Fetchdir
-       (cd Fetchdir && \
+       ($(am__cd) Fetchdir && \
        $(WGET_SV_GIT_CF)config.guess -O config.guess && \
        $(WGET_SV_GIT_CF)config.sub -O config.sub && \
        $(WGET_SV_CVS)texinfo/texinfo/doc/texinfo.tex -O texinfo.tex && \
@@ -1302,7 +1303,7 @@ release-stats: ps
        aml=`cat $$dot_am_files | wc -l` && \
        m4f=`ls -1 $(srcdir)/m4/*.m4 | wc -l` && \
        m4l=`cat $(srcdir)/m4/*.m4 | wc -l` && \
-       doc_text=`cd doc && LC_ALL=C pstops 0 automake.ps unused.ps 2>&1` && \
+       doc_text=`$(am__cd) doc && LC_ALL=C pstops 0 automake.ps unused.ps 2>&1` && \
        echo "$$doc_text" && \
        rm -f doc/unused.ps && \
        doc=`echo "$$doc_text" | sed -n 's/.*Wrote \([1-9][0-9]*\) pages.*/\1/p'` && \

diff --git a/tests/Makefile.am b/tests/Makefile.am
index e3a4ba9..610b18c 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -26,7 +26,7 @@ txinfo5.test
 include $(srcdir)/parallel-tests.am
 
 $(srcdir)/parallel-tests.am: gen-parallel-tests Makefile.am
-       $(AM_V_GEN)(cd $(srcdir) && $(SHELL) ./gen-parallel-tests) >$@
+       $(AM_V_GEN)($(am__cd) $(srcdir) && $(SHELL) ./gen-parallel-tests) >$@
 
 $(parallel_tests): Makefile.am
        $(AM_V_at)rm -f $@ $@-t

diff --git a/tests/Makefile.in b/tests/Makefile.in
index d64b7ac..c3c2863 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -1401,7 +1401,7 @@ pr401b-p.log: pr401b.test
 pr401c-p.log: pr401c.test
 
 $(srcdir)/parallel-tests.am: gen-parallel-tests Makefile.am
-       $(AM_V_GEN)(cd $(srcdir) && $(SHELL) ./gen-parallel-tests) >$@
+       $(AM_V_GEN)($(am__cd) $(srcdir) && $(SHELL) ./gen-parallel-tests) >$@
 
 $(parallel_tests): Makefile.am
        $(AM_V_at)rm -f $@ $@-t