lily/main.cc (main): Remove stale #ifdef for windows.

Cygwin updates

diff --git a/ChangeLog b/ChangeLog
index 8c80b22fa2067becad1557911bd5360f8d9e5fb4..84ac5bac2bcb786668c1a8ba0ea049caf3146923 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -11,6 +11,8 @@
 
 2002-08-09  Jan Nieuwenhuizen  <janneke@gnu.org>
 
+       * lily/main.cc (main): Remove stale #ifdef for windows.
+
        * stepmake/stepmake/python-module-rules.make: 
        * stepmake/stepmake/python-module-vars.make: 
        * stepmake/stepmake/shared-library-vars.make: Add Cygwin support.

diff --git a/VERSION b/VERSION
index 56c3ab2e1c8d5f8b5e15a866fb0ee42453de4512..57aed782e02761560dd11a81c1826851fe4ed2a7 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=5
 PATCH_LEVEL=71
-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/cygwin/changelog b/cygwin/changelog
index 49726d74206357bbd5973a64c3abb16c4fa44512..694078aed0d2c003b3355a4f01d3d71086128f59 100644 (file)
--- a/cygwin/changelog
+++ b/cygwin/changelog
@@ -1,11 +1,18 @@
-lilypond (1.5.71-1) unstable; urgency=low
+lilypond (1.5.71.jcn2-1) unstable; urgency=low
+
+  * lilypond-doc.hint (category): doc.
+  * mknetnel: Also install pfa's.
+  
+ -- Jan Nieuwenhuizen <janneke@gnu.org>  Fri,  9 Aug 2002 18:28:27 +0200
+
+lilypond (1.5.71.jcn1-1) unstable; urgency=low
 
   * Python module now named midi.dll.
   * Fix detection of Cygwin build, which fixes installation of profile.d
     scripts.
   * Build fix.
 
- -- Jan Nieuwenhuizen <janneke@gnu.org>  Fri,  9 Aug 2002 12:48:36 +0200
+ -- Jan Nieuwenhuizen <janneke@gnu.org>  Fri,  9 Aug 2002 17:47:41 +0200
 
 lilypond (1.5.68.jcn1-1) unstable; urgency=low
 
@@ -19,6 +26,4 @@ lilypond (1.5.64.jcn1-1) unstable; urgency=low
 
  -- Jan Nieuwenhuizen <janneke@gnu.org>  Thu,  4 Jul 2002 12:54:08 +0200
 
-Local variables:
-mode: debian-changelog
-End:
+

diff --git a/cygwin/lilypond-doc.hint b/cygwin/lilypond-doc.hint
index 941ced7e8e8acc0f76837f6e795a7eb2c22348f7..3d84e60071f71e2b79d1de98d380c9b1a783d140 100644 (file)
--- a/cygwin/lilypond-doc.hint
+++ b/cygwin/lilypond-doc.hint
@@ -1,5 +1,5 @@
 sdesc: "LilyPond documentation."
-category: Publishing
+category: Doc
 ldesc: "LilyPond Documentation in HTML, PS and DVI formats.
 This package contains the HTML, PostScript and DVI documentation for the
 LilyPond music typesetting software."

diff --git a/cygwin/mknetrel b/cygwin/mknetrel
index d29c76c294561de32c360cacb764caff694e6793..537f6d393c22272cfb015e3d4885ece12c2b5a8e 100644 (file)
--- a/cygwin/mknetrel
+++ b/cygwin/mknetrel
@@ -300,11 +300,14 @@ prebuild () {
        cp -pv $i $(dirname $(dirname $i))/$(basename $i)
     done
 
-    addmakeflags LDFLAGS="$cygwin_prefix/bin/libpython2.2.dll" " " 'target=i686-pc-cygwin'
+    mkdir -p mf/out
+    cp -pv mf/out-for-build/* mf/out
+    
+    addmakeflags MAKE_PFA_FILES=1 ' ' LDFLAGS="$cygwin_prefix/bin/libpython2.2.dll" ' ' 'target=i686-pc-cygwin'
 }
 
 preinstall () {
-    addmakeflags LDFLAGS="$cygwin_prefix/bin/libpython2.2.dll" " " 'target=i686-pc-cygwin'
+    addmakeflags MAKE_PFA_FILES=1 ' ' LDFLAGS="$cygwin_prefix/bin/libpython2.2.dll" ' ' 'target=i686-pc-cygwin'
 }
 
 postinstall () {

diff --git a/lily/main.cc b/lily/main.cc
index e0cc7b9d3fa066f041528fb6e1389155c1e0a5d6..a53db5bc9883a494f590191e0241bfdc201c0330 100644 (file)
--- a/lily/main.cc
+++ b/lily/main.cc
@@ -513,13 +513,7 @@ main (int argc, char **argv)
       exit (2);
     }
 
-#ifdef WINNT
-  scm_boot_guile (argc, argv, main_prog, 0);
-#else
   scm_boot_guile (argc, argv, (void (*) (void*, int, char**))main_prog, 0);
-#endif
 
   return 0;                    // unreachable
 }
-
-