X-Git-Url: https://git.donarmstrong.com/lilypond.git?a=blobdiff_plain;f=configure;h=b10d46123512b12913a13e21accfc82331039a18;hb=37a590823d3e84d379493e0e9f54952d67a67c05;hp=1f7f7b52381068e462427f8ac69e1d904547c5ac;hpb=2ea2d782c903b3de94702387415263c23af97394;p=lilypond.git

diff --git a/configure b/configure
index 1f7f7b5238..b10d461235 100755
--- a/configure
+++ b/configure
@@ -1,15 +1,18 @@
 #!/bin/sh
 
+PREFIX=${PREFIX:-.}
+echo using PREFIX=$PREFIX
 
-NEEDFLOWERVER=1.0.21
+NEEDFLOWERVER=1.0.22
 flowertar=flower-$NEEDFLOWERVER
 here=`pwd`
-if [ -x ../flower ]
+cd ..
+if [ -x flower ]
 then
     echo Found flowerdir
 else
-    cd ../
-    if [ ! -f $flowertar ]
+
+    if [ ! -d $flowertar ]
     then
 	echo "can't find $flowertar"
 	exit 1;
@@ -19,11 +22,10 @@ else
 
 fi
 echo Compiling Library
-cd flower; make
+(cd flower;make)
+
 cd $here
 
-PREFIX="."
 echo '#define LIBDIR "'$PREFIX'/"'> hdr/config.hh
 
-touch depend
 make -f Initial.make