release: 0.1.62

[lilypond.git] / bin / conflily.sh

diff --git a/bin/conflily.sh b/bin/conflily.sh
index e42d608713373f8e2a8f8b3228fe86c533c4c912..0ca024ad8f2da010df0db603c0b3fab3ce68d71c 100755 (executable)
--- a/bin/conflily.sh
+++ b/bin/conflily.sh
@@ -1,35 +1,51 @@
 #!/bin/sh
-# conflily
-# ugh: must be executed from lilypond-x.x.x (bin/conflily)
-
-# the lilypond root dir looks like this:
-# current -> ./lilypond-x.x.x  symlink to current source
-# lilypond-x.x.x               the lilypond source
-# patches                      gzipped patches
-# releases                     gzipped releases
-
-# the lily root dir
+# conflily --- configure LilyPond sourcetree
 #
-lelie=$HOME/music/lily
+# You should set LILYPOND_SOURCEDIR to the latest uppacked source dir,
+# it will default to:
+#
+export LILYPOND_SOURCEDIR=$HOME/lelie/current
+#
+# and create links to here, if necessary
 #
-
 if [ ! -e $HOME/lelie ]; then
-       ln -s $lelie $HOME/lelie
+       (cd ..; ln -s `pwd` $HOME/lelie)
 fi
-
-rm $lelie/current 2>&1 > /dev/null
+#
+#
 current=`basename \`pwd\``
-echo ln -s $lelie/$current $lelie/current
-ln -s $lelie/$current $lelie/current
-
+(cd ..; rm -f current 2>&1 > /dev/null)
+(cd ..; ln -s $current current)
+#
+# The LilyPond root dir looks like this:
+#
+#    current -> ./lilypond-x.x.x    symlink to current source
+#    lilypond-x.x.x/                the unpacked LilyPond source
+#    patches/                       gzipped patches
+#    releases/                      tar gzipped releases
+#    test/                          latest output of 'release'
+#
+#
 if [ "x$LILYINCLUDE" = "x" ]; then
-       echo you should make add the following to your login script
-       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"
+       # we can try...
+       echo you should add the following to your login script
+       if [ "x$MAILADDRESS" = "x" ]; then
+               export MAILADDRESS=$USER@`hostname`
+               echo "        export MAILADDRESS=\$USER@`hostname`"
+       fi
+       export LILYINCLUDE=$LILYPOND_SOURCEDIR/init:$LILYPOND_SOURCEDIR/mf/out
+       export PATH=$PATH$LILYPOND_SOURCEDIR/bin:
+       export MFINPUTS=$MFINPUTS:$LILYPOND_SOURCEDIR/mf
+       export TEXINPUTS=$TEXINPUTS:$LILYPOND_SOURCEDIR/mf/out
+       cat <<EOF
+       export LILYINCLUDE=\$LILYPOND_SOURCEDIR/init:\$LILYPOND_SOURCEDIR/mf/out
+       export PATH=\$PATH:$LILYPOND_SOURCEDIR/bin
+       export MFINPUTS=\$MFINPUTS:\$LILYPOND_SOURCEDIR/mf
+       export TEXINPUTS=\$TEXINPUTS:\$LILYPOND_SOURCEDIR/mf/out
+EOF
 fi
 
-ln -sf $lelie/current/lily/out/lilypond bin/lilypond
-ln -sf $lelie/current/mi2mu/out/mi2mu bin/mi2mu
+ln -sf $LILYPOND_SOURCEDIR/lily/out/lilypond bin/out/lilypond
+ln -sf $LILPPOND_SOURCEDIR/out/mi2mu bin/out/mi2mu
 
 configure --prefix=/usr --enable-debugging --enable-printing --enable-checking --disable-optimise