* 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 ef963d8..60502eb
--- a/buildscripts/lilypond-profile.sh
+++ b/buildscripts/lilypond-profile.sh
@@ -7,39 +7,36 @@
 # If run by hand or from you .profile, run as follows
 #   . lilypond-profile
 
-# This is a bit of a kludge.  Ideally, lilypond's tex, afm, pfa, ps
-# directories should be installed into their location in the texmf/gs
-# trees, rather than messing around with environment variables (eg,
-# see Debian or SuSE package).
 
-datadir=`echo "@datadir@" | sed 's!//!/!g'`
-
-# For direct ps output fonts
-GS_FONTPATH="$datadir/afm:$datadir/pfa:"${GS_FONTPATH:=""}
+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
 
 # For direct ps output: ps/lilyponddefs.ps
 GS_LIB="$datadir/ps:"${GS_LIB:=""}
+export 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"
-
-# include an empty path component for the system wide includes.
-MFINPUTS="$datadir/mf:"${MFINPUTS:=":"}
-TEXINPUTS="$datadir/tex:$datadir/ps:"${TEXINPUTS:=":"}
-TFMFONTS="$datadir/tfm:"${TFMFONTS:=":"}
-TEXPSHEADERS="$datadir/pfa/:"${TEXPSHEADERS:=":"}
-TEXCONFIG="$datadir/pfa/:"${TEXCONFIG:=":"}
-
-
-
-# LILYPONDPREFIX="$datadir"
-# export LILYPONDPREFIX
-
-export MFINPUTS TEXINPUTS TFMFONTS GS_LIB GS_FONTPATH
-export TEXPSHEADERS TEXCONFIG
+# For direct ps output fonts. Add all available TeX Type1 fonts
+GS_FONTPATH=`kpsewhich -expand-path=\\$T1FONTS`:${GS_FONTPATH:=""}
+export GS_FONTPATH