* buildscripts/lilypond-profile.sh,

	buildscripts/lilypond-login.sh: Only set $TEXMF if necessary.
	Thanks to Reuben Thomas <rrt@mupsych.org>

diff --git a/ChangeLog b/ChangeLog
index 3b1166dc456f52393e5fc16599155da96155bed5..fe88461c9dcfe8c665a7d170ec15099eee256f0a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2003-12-03  Mats Bengtsson  <mabe@drongo.s3.kth.se>
+
+       * buildscripts/lilypond-profile.sh,
+       buildscripts/lilypond-login.sh: Only set $TEXMF if necessary.
+       Thanks to Reuben Thomas <rrt@mupsych.org>
+
 2003-12-03  Heikki Junes  <hjunes@cc.hut.fi>
 
        * ly/italiano.ly: additions for semi-sharps and semi-flats by Eric

diff --git a/THANKS b/THANKS
index 245bb0368267bccf627976f62fee1ed425548355..8d37806f134fb0dbe8afa32c7acc8c04846b969b 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -6,6 +6,7 @@ BUG HUNTERS/SUGGESTIONS
 José Luis Cruz
 Thomas Willhalm
 Eric Wurbel
+Reuben Thomas
 
 Release 2.0
 ***********

diff --git a/buildscripts/lilypond-login.sh b/buildscripts/lilypond-login.sh
index f272e67619668b96f923ed114be0d5ffdac5542f..65952f21d0d0db63ce9747422ff422f56ef6120c 100644 (file)
--- a/buildscripts/lilypond-login.sh
+++ b/buildscripts/lilypond-login.sh
@@ -19,9 +19,13 @@ set datadir="@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 = `echo $TEXMF | grep "$datadir"`
+if ( "$alreadyset" == "" ) then
+    set noglob
+    setenv TEXMF "{$datadir,"`kpsexpand  \$TEXMF`"}"
+    unset noglob
+endif
+unset alreadyset
 
 
 

diff --git a/buildscripts/lilypond-profile.sh b/buildscripts/lilypond-profile.sh
index b688455dcdaf788ac8fd5b9f137a6b32244c9396..d8ea2d3e6766d1b23a07de49c12397d6ee311f7f 100644 (file)
--- a/buildscripts/lilypond-profile.sh
+++ b/buildscripts/lilypond-profile.sh
@@ -73,8 +73,11 @@ else
 
        # Add the installation directory to the teTeX system tree, 
        # see Documentation/misc/fontinstallation
-       TEXMF="{$datadir,"`kpsexpand  \\$TEXMF`"}"
-       export TEXMF
+       if [ -z `echo $TEXMF | grep "$datadir"` ]; then
+               TEXMF="{$datadir,"`kpsexpand  \\$TEXMF`"}"
+               export TEXMF
+       fi
+
 
        # For direct ps output: ps/lilyponddefs.ps
        ## GS_LIB="$datadir/ps:"${GS_LIB:=""}