diff options
| author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2014-12-27 16:33:12 +0100 |
|---|---|---|
| committer | Stefano Lattarini <stefano.lattarini@gmail.com> | 2014-12-27 16:33:12 +0100 |
| commit | 047e0cf6a836fc83a5ba335bf8eebd4fe354af0b (patch) | |
| tree | 4850fe5c8a7451902926ca86fd91d0c8d8472c7e /t/instmany-python.sh | |
| parent | bd838a68d44a3adce9ae4b2c5e3e17b47eead7c1 (diff) | |
| parent | cd040965d51f9818c56a714efaaaa699eb93b503 (diff) | |
| download | automake-047e0cf6a836fc83a5ba335bf8eebd4fe354af0b.tar.gz | |
Merge branch 'micro' into minor
* micro:
tests: fix spurious failure in test on TEXINFO_TEX overriding
tests: avoid some spurious failures on AIX 7.1
Diffstat (limited to 't/instmany-python.sh')
| -rw-r--r-- | t/instmany-python.sh | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/t/instmany-python.sh b/t/instmany-python.sh index 40c850223..0088b2d62 100644 --- a/t/instmany-python.sh +++ b/t/instmany-python.sh @@ -33,8 +33,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 @@ -68,8 +66,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 |