X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=buildscripts%2Flilypond-login.sh;h=d0c0377945429cfe4d90df784855808a7bac05b6;hb=d565cc424d8779550e6bed87be9bfb52449759ff;hp=8b472b37845a90e17a9a34f72533d9d1c369222f;hpb=a47b097007d35af452361422c32d8b571c316f0b;p=lilypond.git

diff --git a/buildscripts/lilypond-login.sh b/buildscripts/lilypond-login.sh
index 8b472b3784..d0c0377945 100644
--- a/buildscripts/lilypond-login.sh
+++ b/buildscripts/lilypond-login.sh
@@ -10,32 +10,38 @@
 
 
 # strange shell, this C
-set datadir="@datadir@"
-
- if ( $?GS_LIB ) then
-       setenv GS_LIB "$datadir/ps:$GS_LIB"
- else
-       setenv GS_LIB "$datadir/ps"
- endif
-
+set datadir="@local_lilypond_datadir@"
 
 # setenv LILYPONDPREFIX "$datadir"
-
-# bit silly. for ly2dvi, overrules compiled-in datadir...
-# setenv LILYPONDPREFIX "@datadir@"
+# bit silly. for lilypond, overrules compiled-in datadir...
+# setenv LILYPONDPREFIX "@local_lilypond_datadir@"
 
 # Add the installation directory to the teTeX system tree, 
 # see Documentation/misc/fontinstallation
 
-set noglob
-setenv TEXMF "{$datadir,"`kpsexpand  \$TEXMF`"}"
-unset noglob
+set alreadyset = `kpsexpand \$TEXMF | grep "$datadir"`
+if ( "$alreadyset" == "" ) then
+    set noglob
+    setenv TEXMF "{$datadir,"`kpsexpand  \$TEXMF`"}"
+    unset noglob
+endif
+unset alreadyset
+
+
+
+# if ( $?GS_LIB ) then
+#       setenv GS_LIB "$datadir/ps:$GS_LIB"
+# else
+#       setenv GS_LIB "$datadir/ps"
+# endif
+
+
 
 # Add all available TeX Type1 fonts (including Feta) to Ghostscript:
-if ( $?GS_FONTPATH ) then
-       setenv GS_FONTPATH `kpsewhich -expand-path=\$T1FONTS`:$GS_FONTPATH
-else
-       setenv GS_FONTPATH `kpsewhich -expand-path=\$T1FONTS`
-endif
+#if ( $?GS_FONTPATH ) then
+#       setenv GS_FONTPATH `kpsewhich -expand-path=\$T1FONTS`:$GS_FONTPATH
+#else
+#       setenv GS_FONTPATH `kpsewhich -expand-path=\$T1FONTS`
+#endif