]> git.ipfire.org Git - thirdparty/automake.git/commitdiff
tests: avoid few useless uses of the `-e' make option
authorStefano Lattarini <stefano.lattarini@gmail.com>
Thu, 6 Oct 2011 13:00:37 +0000 (15:00 +0200)
committerStefano Lattarini <stefano.lattarini@gmail.com>
Thu, 6 Oct 2011 13:01:50 +0000 (15:01 +0200)
* tests/python12.test: Using `make -e' is not required to override
the DESTDIR variable, since this variable shouldn't be defined in
any automake-generated Makefile.in file.
* tests/man2.test: Likewise.
* tests/man5.test: Likewise.

ChangeLog
tests/man2.test
tests/man5.test
tests/python12.test

index 6e6783efa906925d6b4c2c4920adafb72c19a8e7..686a30d31a3fa79f8a75a929d0bf899e38b95474 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2011-10-06  Stefano Lattarini  <stefano.lattarini@gmail.com>
+
+       tests: avoid few useless uses of the `-e' make option
+       * tests/python12.test: Using `make -e' is not required to override
+       the DESTDIR variable, since this variable shouldn't be defined in
+       any automake-generated Makefile.in file.
+       * tests/man2.test: Likewise.
+       * tests/man5.test: Likewise.
+
 2011-10-06  Stefano Lattarini  <stefano.lattarini@gmail.com>
 
        fix: make a test script executable
index a4d1815690c30674c9a3ad03f5ff68256ef40d51..6777f9711c11880443b31c82f11d9a7fb1fc55de 100755 (executable)
@@ -39,13 +39,13 @@ $AUTOMAKE
 
 # Let's play with $DESTDIR too, it shouldn't hurt.
 ./configure --prefix='' --mandir=/man
-DESTDIR="`pwd`/_inst" $MAKE -e install
+$MAKE DESTDIR="`pwd`/_inst" install
 
 test -f ./_inst/man/man2/foo.2
 test -f ./_inst/man/man4/foo.4
 test -f ./_inst/man/man4/bar.4
 
-DESTDIR="`pwd`/_inst" $MAKE -e uninstall
+$MAKE DESTDIR="`pwd`/_inst" uninstall
 
 test ! -f ./_inst/man/man2/foo.2
 test ! -f ./_inst/man/man4/foo.4
index 28bcff06407c1ee19db52a34407531a9b46f0821..955442e11231965d31ab5b34030a28589d17c569 100755 (executable)
@@ -42,7 +42,7 @@ $AUTOMAKE
 
 # Let's play with $DESTDIR too, it shouldn't hurt.
 ./configure --mandir=/man
-DESTDIR="`pwd`/_inst" $MAKE -e install
+$MAKE DESTDIR="`pwd`/_inst" install
 
 test -f ./_inst/man/man2/foo.2
 test -f ./_inst/man/man2/nfoo.2
@@ -55,7 +55,7 @@ test ! -d ./_inst/man/man1
 test ! -d ./_inst/man/man4
 test ! -d ./_inst/man/man5
 
-DESTDIR="`pwd`/_inst" $MAKE -e uninstall
+$MAKE DESTDIR="`pwd`/_inst" uninstall
 
 test ! -f ./_inst/man/man2/foo.2
 test ! -f ./_inst/man/man2/nfoo.2
index 1ff9b4a13be1291195b37d613a2a127edd526ae6..378a0dc82ddce70cfe3e327ae05b877fe910a092 100755 (executable)
@@ -42,7 +42,7 @@ instdir=`pwd`/inst
 mkdir build
 cd build
 ../configure --prefix="/usr"
-DESTDIR=$instdir $MAKE -e install
+$MAKE install DESTDIR=$instdir
 
 # Perfunctory test that the files were created.
 test -f "$instdir/usr/share/my/my.py"