patch::: 1.4.9.jcn2

1.4.9.jcn2

diff --git a/CHANGES b/CHANGES
index 5f97d638efbee0dbedadfb80ba3c3747d4d6ed30..61e718ff75479b0f0ef769b07bf90aaadddbf0a9 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,10 @@
-1.4.9.jcn1
+1.4.9.jcn2
 ==========
 
+* Included Han-Wen's uu1 windows fixes.
+
+* Bugfix: lilypond-profile.sh: append to GS_FONTPATH, GS_LIB.
+
 * Added Cygwin setup.hint
 
 * Removed tex, python wrappers and postinstalls to go with Cywgin's

diff --git a/Documentation/windows/gs-profile.sh b/Documentation/windows/gs-profile.sh
index b3342f8baa1960ba77b41249f1d56120d6b1193d..3e533b1f71f3bbfe3722852c0b451a2614b83ff2 100644 (file)
--- a/Documentation/windows/gs-profile.sh
+++ b/Documentation/windows/gs-profile.sh
@@ -2,17 +2,21 @@
 # /etc/profile.d/gs-profile.sh -- Check for GhostScript
 
 gs550="/usr/windows/gstools/gs5.50"
-gs650="/usr/windows/gs/gs6.50/bin"
+gs650="/usr/windows/gs/gs6.50"
 
 # Maybe read registry, but that may be hairy?
 # 
 # $ regtool get \\HKLM\\Software\\CLASSES\\psfile\\shell\\open\\command\\
 # "C:\GSTOOLS\GSVIEW\gsview32.exe" "%1"
 
+## we set GS_LIB although the registry keys have been set.
+
 if [ -e "$gs550/gswin32.exe" ]; then
        PATH="$gs550:$PATH"
+       GS_LIB="$gs550/lib:"${GS_LIB:=""}
 fi
 
-if [ -e "$gs650/gswin32.exe" ]; then
-       PATH="$gs650:$PATH"
+if [ -e "$gs650/bin/gswin32.exe" ]; then
+       PATH="$gs650/bin:$PATH"
+       GS_LIB="$gs650/lib:"${GS_LIB:=""}
 fi

diff --git a/VERSION b/VERSION
index 2cf04d37eb971f0f85fcd3ab2b6ad1621e885db1..5c97b9d37601c8212959983b824027fcc01539cb 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=4
 PATCH_LEVEL=9
-MY_PATCH_LEVEL=jcn1
+MY_PATCH_LEVEL=jcn2
 
 # use the above to send patches: MY_PATCH_LEVEL is always empty for a
 # released version.

diff --git a/buildscripts/lilypond-profile.sh b/buildscripts/lilypond-profile.sh
index 880b6a5d2cb34c6fa3d189a047c495983b853dd7..335ca158a25bf9cb3051aed10c4ff2f28995dc06 100755 (executable)
--- a/buildscripts/lilypond-profile.sh
+++ b/buildscripts/lilypond-profile.sh
@@ -12,10 +12,10 @@
 datadir="@datadir@"
 
 # For direct ps output fonts
-GS_FONTPATH="$datadir/afm:$datadir/pfa"
+GS_FONTPATH="$datadir/afm:$datadir/pfa:"${GS_FONTPATH:=""}
 
 # For direct ps output: ps/lilyponddefs.ps
-GS_LIB="$datadir/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