diff options
| author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2013-10-30 01:04:24 +0000 |
|---|---|---|
| committer | Stefano Lattarini <stefano.lattarini@gmail.com> | 2013-10-30 01:04:24 +0000 |
| commit | b7bdb2c3f2fb66a2384123670fb47b83d30c4bf9 (patch) | |
| tree | 6b9a03bca860da77ded7003b2b90e3f9f602c246 /maintainer | |
| parent | d26663f638eef5acfa9605db7a338fd3675dba1c (diff) | |
| parent | 82216ce83ba3cdf3572b58e4d9e84886ab02d22d (diff) | |
| download | automake-b7bdb2c3f2fb66a2384123670fb47b83d30c4bf9.tar.gz | |
Merge branch 'minor'
* minor:
tests: fix spurious failure when zip is present but unzip is not
tests: fix spurious failure due to localization issues
NEWS: update with the changes since v1.14
docs: correct typos in the fix-timestamp.sh script
python: byte-compile nobase_*_PYTHON files only once
cosmetics: typofix in the 'missing' script
test: avoid false positives in 'cc-no-c-o' script
test harness: improve catching of usage errors in script 'test-driver'
tests: fix a spurious failure on NetBSD-current
am-ft: make the environment available earlier
NEWS: post-release tweaks (for 1.14.x series)
tests: avoid a spurious failure on MacOS X 10.6.8
tests: don't risk hanging on the 'cl' requirement
Diffstat (limited to 'maintainer')
| -rwxr-xr-x | maintainer/am-ft | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/maintainer/am-ft b/maintainer/am-ft index 1d227906e..bb07c165c 100755 --- a/maintainer/am-ft +++ b/maintainer/am-ft @@ -104,8 +104,7 @@ ssh -t -t $remote " || rm -rf $distdir || exit 1 test ! -e $distdir fi - xz -dc $tarball | tar xf - - cd $distdir + export $env "' am_extra_acdir=$HOME/.am-test/extra-aclocal am_extra_bindir=$HOME/.am-test/extra-bin @@ -117,7 +116,8 @@ ssh -t -t $remote " export PATH=$am_extra_bindir:$PATH fi '" - export $env + xz -dc $tarball | tar xf - + cd $distdir if test -f \"\$am_extra_setup\"; then . \"\$am_extra_setup\" fi |