From: Ralf Wildenhues Date: Fri, 22 Apr 2005 10:20:46 +0000 (+0000) Subject: * Makefile.am, HACKING: Use lt__cd throughout. X-Git-Tag: release-2-1b~661 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=93cd550c928068ae49ed370cbf2c40b05fe89c9b;p=thirdparty%2Flibtool.git * Makefile.am, HACKING: Use lt__cd throughout. --- diff --git a/ChangeLog b/ChangeLog index 048fd5919..c8962802a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2005-04-22 Ralf Wildenhues (tiny change) + + * Makefile.am, HACKING: Use lt__cd throughout. + 2005-04-22 Gary V. Vaughan The FSF are moving offices today. Changed their contact address diff --git a/HACKING b/HACKING index 1d3b88ad7..4813a5ee2 100644 --- a/HACKING +++ b/HACKING @@ -186,7 +186,7 @@ yyyy-mm-dd Name of Author (tiny change) * Never use basename or dirname. Instead use sed. -* Do not use `cd' within back-quotes, use `$(am__cd)' instead. +* Do not use `cd' within back-quotes, use `$(lt__cd)' instead. Otherwise the directory name may be printed, depending on CDPATH. * In general, if a loop is required, it should be silent. Then the body diff --git a/Makefile.am b/Makefile.am index 960952014..d57e4f9b6 100644 --- a/Makefile.am +++ b/Makefile.am @@ -29,6 +29,9 @@ SUBDIRS = $(BUILD_SUBDIRS) DIST_SUBDIRS = $(BUILD_SUBDIRS) EXTRA_DIST = +# Using `cd' in backquotes may print the directory name, use this instead: +lt__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd + ## ---------------- ## ## Libtool scripts. ## @@ -66,7 +69,7 @@ configure-subdirs distdir: $(DIST_MAKEFILE_LIST) @DIST_MAKEFILE_LIST@: dir=`echo $@ | sed 's,^[^/]*$$,.,;s,/[^/]*$$,,'`; \ test -d $$dir || mkdir $$dir || exit 1; \ - abs_srcdir=`cd $(srcdir) && pwd`; \ + abs_srcdir=`$(lt__cd) $(srcdir) && pwd`; \ (cd $$dir && $$abs_srcdir/$$dir/configure) || exit 1 @@ -340,7 +343,6 @@ tests/atconfig: config.status $(SHELL) ./config.status tests/atconfig DISTCLEANFILES += tests/atconfig -lt__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd CD_TESTDIR = abs_srcdir=`$(lt__cd) $(srcdir) && pwd`; cd tests # Hook the test suite into the check rule