* VERSION (MY_PATCH_LEVEL): make 1.7.0

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

diff --git a/buildscripts/lilypond-profile.sh b/buildscripts/lilypond-profile.sh
index 60502ebf536e343cd3935dbdbb4e54802c080482..f1a941c411c6b95692e2d875b5b9ad2a140a3159 100644 (file)
--- a/buildscripts/lilypond-profile.sh
+++ b/buildscripts/lilypond-profile.sh
@@ -9,18 +9,10 @@
 
 
 if [ -z "$LILYPONDPREFIX" ]; then
-    datadir=`echo "@datadir@" | sed 's!//!/!g'`
+    datadir=`echo "@local_lilypond_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"
+    if [ -d "$LILYPONDPREFIX/share" ]; then
+       datadir=$LILYPONDPREFIX/share/lilypond/
     fi
     echo "Setting tree to $datadir"
 fi
@@ -31,12 +23,12 @@ TEXMF="{$datadir,"`kpsexpand  \\$TEXMF`"}"
 export TEXMF
 
 # For direct ps output: ps/lilyponddefs.ps
-GS_LIB="$datadir/ps:"${GS_LIB:=""}
-export GS_LIB
+## 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
+## GS_FONTPATH=`kpsewhich -expand-path=\\$T1FONTS`:${GS_FONTPATH:=""}
+## export GS_FONTPATH