* aclocal.m4: Regenerate.

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

diff --git a/buildscripts/lilypond-profile.sh b/buildscripts/lilypond-profile.sh
index 22af4fb64c87b63f99cf807f0f9a378a726ec039..60502ebf536e343cd3935dbdbb4e54802c080482 100644 (file)
--- a/buildscripts/lilypond-profile.sh
+++ b/buildscripts/lilypond-profile.sh
@@ -8,24 +8,31 @@
 #   . lilypond-profile
 
 
-
-if [ "$LILYPONDPREFIX" == "" ] ; then
+if [ -z "$LILYPONDPREFIX" ]; then
     datadir=`echo "@datadir@" | sed 's!//!/!g'`
 else
-## to support development from ~/usr/src/lilypon.
-    datadir=$LILYPONDPREFIX
+    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"
 fi
 
-# For direct ps output: ps/lilyponddefs.ps
-GS_LIB="$datadir/ps:"${GS_LIB:=""}
-export GS_LIB
-
-
 # Add the installation directory to the teTeX system tree, 
 # see Documentation/misc/fontinstallation
 TEXMF="{$datadir,"`kpsexpand  \\$TEXMF`"}"
 export TEXMF
 
+# For direct ps output: ps/lilyponddefs.ps
+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:=""}