X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=buildscripts%2Flilypond-profile.sh;h=f1a941c411c6b95692e2d875b5b9ad2a140a3159;hb=d765f3af45be51f15da55cf570a4b172200e1035;hp=95cd90bd84c8fe4ab74c13225502ef99b913e9a9;hpb=fac2e6ddfa211af496cf9274b7c91e06d79404d3;p=lilypond.git

diff --git a/buildscripts/lilypond-profile.sh b/buildscripts/lilypond-profile.sh
old mode 100755
new mode 100644
index 95cd90bd84..f1a941c411
--- a/buildscripts/lilypond-profile.sh
+++ b/buildscripts/lilypond-profile.sh
@@ -4,39 +4,31 @@
 
 # Red Hat-like systems should install this in /etc/profile.d/
 
-# 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).
+# If run by hand or from you .profile, run as follows
+#   . lilypond-profile
 
-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 "@local_lilypond_datadir@" | sed 's!//!/!g'`
+else
+    if [ -d "$LILYPONDPREFIX/share" ]; then
+	datadir=$LILYPONDPREFIX/share/lilypond/
+    fi
+    echo "Setting tree to $datadir"
+fi
 
-# 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"
-
-# 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:=":"}
+# 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
 
-
-# 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