* aclocal.m4: Regenerate.

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

diff --git a/buildscripts/lilypond-profile.sh b/buildscripts/lilypond-profile.sh
old mode 100755 (executable)
new mode 100644 (file)
index 1e03ea4..60502eb
--- a/buildscripts/lilypond-profile.sh
+++ b/buildscripts/lilypond-profile.sh
@@ -7,30 +7,36 @@
 # If run by hand or from you .profile, run as follows
 #   . lilypond-profile
 
-datadir=`echo "@datadir@" | sed 's!//!/!g'`
 
-# For direct ps output: ps/lilyponddefs.ps
-GS_LIB="$datadir/ps:"${GS_LIB:=""}
-
-# bit silly. for ly2dvi, overrules compiled-in datadir...
-# Better comment this out.  Compiled-in datadir serves exactly the
-# same purpose, but is more likely to be correct (think multiple
-# versions of lilypond).
-# LILYPONDPREFIX="$datadir"
+if [ -z "$LILYPONDPREFIX" ]; then
+    datadir=`echo "@datadir@" | sed 's!//!/!g'`
+else
+    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
 
 # Add the installation directory to the teTeX system tree, 
 # see Documentation/misc/fontinstallation
 TEXMF="{$datadir,"`kpsexpand  \\$TEXMF`"}"
+export TEXMF
 
-# LILYPONDPREFIX="$datadir"
-# export LILYPONDPREFIX
+# 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:=""}
-
-
-
-export GS_LIB GS_FONTPATH TEXMF
+GS_FONTPATH=`kpsewhich -expand-path=\\$T1FONTS`:${GS_FONTPATH:=""}
+export GS_FONTPATH