diff options
author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-06-30 13:42:10 +0200 |
---|---|---|
committer | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-06-30 13:42:10 +0200 |
commit | e2f007f0c78e011c5fab60bfad332f6aad0989f1 (patch) | |
tree | be80565c69b2d10304151e39afdc6772c888e7d7 /t/instdir-texi.sh | |
parent | 8c784651a7da7dc85bd989e75ce63e35762ce27f (diff) | |
parent | 9238349c18f1a6f73c32d1e8b62fb5cfaa83bd06 (diff) | |
download | automake-e2f007f0c78e011c5fab60bfad332f6aad0989f1.tar.gz |
Merge branch 'maint'
* maint:
tests: fix a spurious failure
configure: fix detection of POSIX shell to work in a VPATH build
tests: prefer "test ! -e FILE" to check that a file doesn't exist
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Diffstat (limited to 't/instdir-texi.sh')
-rwxr-xr-x | t/instdir-texi.sh | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/t/instdir-texi.sh b/t/instdir-texi.sh index b15ecaac8..33bf6361e 100755 --- a/t/instdir-texi.sh +++ b/t/instdir-texi.sh @@ -60,10 +60,11 @@ infodir= htmldir= dvidir= psdir= pdfdir= export infodir htmldir dvidir psdir pdfdir $MAKE -e install install-html install-dvi install-ps install-pdf -test ! -d "$instdir" -$MAKE -e install install-html install-dvi install-ps install-pdf DESTDIR="$destdir" -test ! -d "$instdir" -test ! -d "$destdir" +test ! -e "$instdir" +$MAKE -e install install-html install-dvi install-ps install-pdf \ + DESTDIR="$destdir" +test ! -e "$instdir" +test ! -e "$destdir" $MAKE -e uninstall > stdout || { cat stdout; exit 1; } cat stdout grep 'rm -f' stdout && exit 1 |