partial: 0.1.57.jcn

[lilypond.git] / bin / conflily.in

diff --git a/bin/conflily.in b/bin/conflily.in
old mode 100644 (file)
new mode 100755 (executable)
index a89f9e7..2eab5a0
--- a/bin/conflily.in
+++ b/bin/conflily.in
@@ -22,15 +22,16 @@ current=`basename \`pwd\``
 echo ln -s $lelie/$current $lelie/current
 ln -s $lelie/$current $lelie/current
 
-ln -sf $lelie/current/lily/out/lilypond bin/out/lilypond
-ln -sf $lelie/current/mi2mu/out/mi2mu bin/out/mi2mu
-
 if [ "x$LILYINCLUDE" = "x" ]; then
        echo you should make add the following to your login script
-       echo "export LILYINCLUDE=$lelie/current/init:$lelie/current/input:$lelie/current/mutopia:$lelie/current/mutopia/out:$lelie/current/input:$lelie/current/mutopia/J.S.Bach:$lelie/current/mutopia/J.S.Bach/out"
-       echo "export PATH=$PATH:$lelie/current/bin/out/"
+       echo "export LILYINCLUDE=$lelie/current/init:$lelie/current/mutopia:$lelie/current/input:$lelie/current/mutopia/J.S.Bach:"
+       echo "export PATH=$PATH:$lelie/current/bin"
        echo "export MFINPUTS=$MFINPUTS:$lelie/current/mf"
 fi
 
-configure --prefix=/usr --enable-debugging --enable-printing --enable-checking
+mkdir -p ../build
+(cd ../build; 
+ln -sf $lelie/build/lily/lilypond bin/lilypond
+ln -sf $lelie/build/mi2mu/mi2mu bin/mi2mu
+../current/configure --prefix=/usr --enable-debugging --enable-printing --enable-checking)