X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=test%2Fsetup-test;h=ffd9e644633424c5c479ec85123c5caabcae1c4b;hp=fab26a0e1af04a8b11b33bde474aad54f2d1153e;hb=88b2142594d5ea1e8385dae5eca81eed1018c555;hpb=788c353a8bee07520ae1a1de6fb7bdcdf1f4f1c7

diff --git a/test/setup-test b/test/setup-test
index fab26a0..ffd9e64 100755
--- a/test/setup-test
+++ b/test/setup-test
@@ -2,21 +2,25 @@
 
 set -e
 
-if TEMPDIR=`cat test-temp-dir 2> /dev/null` \
-   && [ -e $TEMPDIR/bld/Makefile ]; then
-    (cd $TEMPDIR/bld && make all install)
-    exit
+if TEMPDIR="`cat test-temp-dir 2>/dev/null`" \
+		&& [ -f "$TEMPDIR/build/Makefile" ]; then
+	(cd "$TEMPDIR/build" && make all install)
+	exit
 fi
 
-TEMPDIR=`mktemp -d /tmp/nmh-test-XXXXXXXX`
-echo $TEMPDIR > test-temp-dir
+TEMPDIR="`mktemp -d /tmp/mmh-test-XXXXXXXX`"
+echo "$TEMPDIR" >test-temp-dir
 
 cd ..
-if ! [ -e configure ]; then
-    ./autogen.sh
+srcdir="$PWD"
+if [ ! -f configure ]; then
+	./autogen.sh
 fi
-srcdir=$PWD
-mkdir $TEMPDIR/bld
-cd $TEMPDIR/bld
-$srcdir/configure --prefix=$TEMPDIR --with-locking=fcntl --enable-debug
-make install
+if [ -f Makefile ]; then
+	make -s clean
+fi
+
+mkdir "$TEMPDIR/build"
+cd "$TEMPDIR/build"
+"$srcdir/configure" -q --prefix="$TEMPDIR" --enable-debug
+make -s all install