From: Jan Nieuwenhuizen <janneke@gnu.org>
Date: Wed, 9 Feb 2005 16:26:35 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: release/2.4.6~33
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=14891ef5656240a21aec25de4ba0f844062a7698;p=lilypond.git

*** empty log message ***
---

diff --git a/ChangeLog b/ChangeLog
index 706a10d164..cc55dd353d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2005-02-09  Jan Nieuwenhuizen  <janneke@gnu.org>
+
+	* Cygwin patch from Bertalan.
+
 2005-02-08  Jan Nieuwenhuizen  <janneke@gnu.org>
 
 	* GNUmakefile.in: teTeX-3.0 build fix: add map symlink.
diff --git a/buildscripts/builder.py b/buildscripts/builder.py
index 3a65c176e1..963eba5828 100644
--- a/buildscripts/builder.py
+++ b/buildscripts/builder.py
@@ -211,7 +211,7 @@ def add_enc_src (target, source, env):
 a = 'cd ${TARGET.dir} && \
 if test -e ${SOURCE.filebase}.enc; then encoding="--encoding=${SOURCE.filebase}.enc"; fi; \
 MFINPUTS=$srcdir/mf:.: \
-mftrace --pfa --simplify --keep-trying $$encoding $TOO__verbose \
+mftrace --formats=pfa --simplify --keep-trying $$encoding $TOO__verbose \
 --include=${TARGET.dir} \
 ${SOURCE.file}'
 
diff --git a/cygwin/mknetrel b/cygwin/mknetrel
index e8b8253190..826f27ee87 100644
--- a/cygwin/mknetrel
+++ b/cygwin/mknetrel
@@ -141,7 +141,7 @@ prebuild () {
     # set LDFLAGS to find the python library
     # EXTRABUILDARGS="LDFLAGS=$cygwin_root/usr/bin/libpython2.3.dll"
 
-    addmakeflags LDFLAGS="$cygwin_root/usr/bin/libpython2.3.dll" ' ' "target=i686-pc-cygwin" ' '
+    addmakeflags LDFLAGS="$cygwin_root/usr/bin/libpython2.4.dll" ' ' "target=i686-pc-cygwin" ' '
 
     if iscygwin; then
 	# EXTRABUILDARGS="$EXTRABUILDARGS all doc web"