diff options
| author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2014-12-28 11:56:32 +0100 |
|---|---|---|
| committer | Stefano Lattarini <stefano.lattarini@gmail.com> | 2014-12-28 11:56:32 +0100 |
| commit | be85adf480272e24d9167c83715916d20eb9006b (patch) | |
| tree | 48797d164e415bcdad1eb1d993f11fb818f94778 /t/instmany-mans.sh | |
| parent | a34409f0ab805c7f83cecc2f520bada748a07584 (diff) | |
| parent | 75ba55ff95160c6a59995263e29ee6061b815881 (diff) | |
| download | automake-be85adf480272e24d9167c83715916d20eb9006b.tar.gz | |
Merge branch 'master' into ng/master
* master:
tests: avoid a possible failure due to autom4te cache staleness
tests: fix spurious failure in test on TEXINFO_TEX overriding
tests: avoid some spurious failures on AIX 7.1
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Diffstat (limited to 't/instmany-mans.sh')
| -rw-r--r-- | t/instmany-mans.sh | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/t/instmany-mans.sh b/t/instmany-mans.sh index be33a02ab..0ed23488f 100644 --- a/t/instmany-mans.sh +++ b/t/instmany-mans.sh @@ -37,8 +37,6 @@ mkdir x-bin sed "s|@limit@|$limit|g" >x-bin/my-install <<'END' #! /bin/sh -# Fake install script. This doesn't really install -# (the INSTALL path below would be wrong outside this directory). limit=@limit@ PATH=$oPATH; export PATH if test -z "$orig_INSTALL"; then @@ -72,8 +70,16 @@ END # Creative quoting in the next line to please maintainer-check. chmod +x x-bin/'rm' x-bin/my-install -cat > setenv.in <<'END' -orig_INSTALL='@INSTALL@'; export orig_INSTALL +cat >setenv.in <<'END' +orig_INSTALL='@INSTALL@' +# In case we've falled back on the install-sh script (seen e.g., +# on AIX 7.1), we need to make sure we use its absolute path, +# as we don't know from which directory we'll be run. +case "$orig_INSTALL" in + /*) ;; + */*) orig_INSTALL=$(pwd)/$orig_INSTALL;; +esac +export orig_INSTALL END cat >>configure.ac <<END |