* aclocal.m4: Regenerate.

[lilypond.git] / buildscripts / lilypond-profile.sh

diff --git a/buildscripts/lilypond-profile.sh b/buildscripts/lilypond-profile.sh
index 74736942d19a0bad546520915ff81c7c082f5f0d..60502ebf536e343cd3935dbdbb4e54802c080482 100644 (file)
--- a/buildscripts/lilypond-profile.sh
+++ b/buildscripts/lilypond-profile.sh
@@ -8,15 +8,18 @@
 #   . lilypond-profile
 
 
-
-if [ "$LILYPONDPREFIX" == "" ] ; then
+if [ -z "$LILYPONDPREFIX" ]; then
     datadir=`echo "@datadir@" | sed 's!//!/!g'`
 else
-    if [ -d "$LILYPONDPREFIX/fonts" ] ; then
+    if [ -d "$LILYPONDPREFIX/fonts" ]; then
        datadir=$LILYPONDPREFIX
     else
        eval `cat $LILYPONDPREFIX/VERSION`
        FULLVERSION="$MAJOR_VERSION.$MINOR_VERSION.$PATCH_LEVEL"
+       if [ "" != "$MY_PATCH_LEVEL" ]; then
+           FULLVERSION="$FULLVERSION.$MY_PATCH_LEVEL"
+       fi 
+       
        datadir="$LILYPONDPREFIX/share/lilypond/$FULLVERSION"
     fi
     echo "Setting tree to $datadir"
@@ -31,9 +34,6 @@ export TEXMF
 GS_LIB="$datadir/ps:"${GS_LIB:=""}
 export GS_LIB
 
-
-
-
 # For direct ps output fonts. Add all available TeX Type1 fonts
 GS_FONTPATH=`kpsewhich -expand-path=\\$T1FONTS`:${GS_FONTPATH:=""}
 export GS_FONTPATH