That is, when the testsuite is run using a fake C compiler that doesn't grasp the '-c' and '-o' options together.
* t/instdir-prog.sh: Adjust. * t/instdir-ltlib.sh: Likewise. Signed-off-by: Stefano Lattarini <stefano.lattar...@gmail.com> --- t/instdir-ltlib.sh | 23 ++++++++++++++++------- t/instdir-prog.sh | 22 +++++++++++++++------- 2 files changed, 31 insertions(+), 14 deletions(-) diff --git a/t/instdir-ltlib.sh b/t/instdir-ltlib.sh index 726f809..273206c 100755 --- a/t/instdir-ltlib.sh +++ b/t/instdir-ltlib.sh @@ -66,22 +66,31 @@ cd build ../configure --prefix="$instdir" PYTHON="echo" \ am_cv_python_pythondir="$instdir/python" \ am_cv_python_pyexecdir="$instdir/pyexec" -$MAKE +xMAKE () +{ + # Early line break here to please maintainer-check. + $MAKE \ + bindir= libdir= pyexecdir= \ + AM_MAKEFLAGS='bindir= libdir= pyexecdir=' \ + "$@" +} + +xMAKE -bindir= libdir= pyexecdir= -export bindir libdir pyexecdir -$MAKE -e install +xMAKE install test ! -e "$instdir" -$MAKE -e install DESTDIR="$destdir" +xMAKE install DESTDIR="$destdir" test ! -e "$instdir" test ! -e "$destdir" -$MAKE -e uninstall > stdout || { cat stdout; exit 1; } +xMAKE uninstall > stdout || { cat stdout; exit 1; } cat stdout # Creative quoting below to please maintainer-check. grep 'rm'' ' stdout && exit 1 -$MAKE -e uninstall DESTDIR="$destdir" > stdout || { cat stdout; exit 1; } +xMAKE uninstall DESTDIR="$destdir" > stdout || { cat stdout; exit 1; } cat stdout # Creative quoting below to please maintainer-check. grep 'rm'' ' stdout && exit 1 +$MAKE + : diff --git a/t/instdir-prog.sh b/t/instdir-prog.sh index f916a11..f2b96b8 100755 --- a/t/instdir-prog.sh +++ b/t/instdir-prog.sh @@ -65,20 +65,28 @@ cd build ../configure --prefix="$instdir" PYTHON="echo" \ am_cv_python_pythondir="$instdir/python" \ am_cv_python_pyexecdir="$instdir/pyexec" -$MAKE -bindir= libdir= pyexecdir= -export bindir libdir pyexecdir -$MAKE -e install +xMAKE () +{ + # Early line break here to please maintainer-check. + $MAKE \ + bindir= libdir= pyexecdir= \ + AM_MAKEFLAGS='bindir= libdir= pyexecdir=' \ + "$@" +} + +xMAKE + +xMAKE install test ! -e "$instdir" -$MAKE -e install DESTDIR="$destdir" +xMAKE install DESTDIR="$destdir" test ! -e "$instdir" test ! -e "$destdir" -$MAKE -e uninstall > stdout || { cat stdout; exit 1; } +xMAKE uninstall > stdout || { cat stdout; exit 1; } cat stdout # Creative quoting below to please maintainer-check. grep 'rm'' ' stdout && exit 1 -$MAKE -e uninstall DESTDIR="$destdir" > stdout || { cat stdout; exit 1; } +xMAKE uninstall DESTDIR="$destdir" > stdout || { cat stdout; exit 1; } cat stdout # Creative quoting below to please maintainer-check. grep 'rm'' ' stdout && exit 1 -- 1.8.3.rc2