release: 0.0.78

[lilypond.git] / bin / conflily

diff --git a/bin/conflily b/bin/conflily
index 4623edacf5c8c081e0631bd3135582ffbfa54fa4..2a495a1308a0c20f6e3576b0285c3c753b315b55 100755 (executable)
--- a/bin/conflily
+++ b/bin/conflily
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 # conflily
 # ugh: must be executed from lilypond-x.x.x (bin/conflily)
 
@@ -17,16 +17,18 @@ if [ ! -e $HOME/lelie ]; then
        ln -s $lelie $HOME/lelie
 fi
 
-rm $lelie/current >& /dev/null
+rm $lelie/current 2>&1 > /dev/null
 current=`basename \`pwd\``
 echo ln -s $lelie/$current $lelie/current
 ln -s $lelie/$current $lelie/current
 
-ln -sf $lelie/current/lily/out/lilypond bin/lilypond
-ln -sf $lelie/current/mi2mu/out/mi2mu bin/mi2mu
+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
-       export LILYINCLUDE=$lelie/current/init
+       echo you should make add the following to your login script
+       echo "export LILYINCLUDE=$lelie/current/init"
+       echo "export PATH=$PATH:$lelie/current/bin/out/"
 fi
 
 configure --prefix=$root --enable-debugging --enable-printing --enable-checking