From: matsb <matsb>
Date: Wed, 3 Dec 2003 14:14:12 +0000 (+0000)
Subject: 	* buildscripts/lilypond-profile.sh,
X-Git-Tag: release/2.1.3~5
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=a09df47069a9a4368f4ce52fbf166ae9cdae859c;p=lilypond.git

	* 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 3b1166dc45..fe88461c9d 100644
--- 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 245bb03682..8d37806f13 100644
--- 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 f272e67619..65952f21d0 100644
--- 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 b688455dcd..d8ea2d3e67 100644
--- 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:=""}