* cygwin/README.in: New file.

diff --git a/ChangeLog b/ChangeLog
index 77c9888a6c3d438f8c943d380d7236bb029b6bba..9199c4c8e9b0e44140facfe29532080871fc40ab 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2002-08-12  Jan Nieuwenhuizen  <janneke@gnu.org>
 
+       * cygwin/README.in: New file.
+
        * input/sondag-morgen/GNUmakefile: 
        * input/mutopia/R.Schumann/GNUmakefile: New file.
 

diff --git a/VERSION b/VERSION
index 0c9a700a46ccc7eb67dd554d4994996c38913bf4..42c4d31e6e4a277cdbcca5b22282df2ffa4a315c 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=5
 PATCH_LEVEL=72
-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/GNUmakefile b/cygwin/GNUmakefile
index e5610e3777155af5a4c6471abe5df523cf189044..4fa21e40997991691b14111b3174407756f374dd 100644 (file)
--- a/cygwin/GNUmakefile
+++ b/cygwin/GNUmakefile
@@ -2,15 +2,15 @@ depth = ..
 
 NAME = cygwin
 
-EXTRA_DIST_FILES = README changelog mknetrel $(wildcard *.sh *.hint)
-
-STEPMAKE_TEMPLATES = install install-out
+EXTRA_DIST_FILES = changelog mknetrel $(wildcard *.sh *.hint)
 
 include $(depth)/make/stepmake.make
 
 # For cygwin builds only
 ifneq ($(CYGWIN_BUILD),)
 
+STEPMAKE_TEMPLATES = install install-out
+
 POST_INSTALLS=$(wildcard post-*.sh)
 OUT_POST_INSTALLS=$(POST_INSTALLS:%=$(outdir)/%)
 
@@ -48,13 +48,5 @@ INSTALLATION_OUT_FILES1=$(OUT_PROFILES)
 INSTALLATION_OUT_DIR2=$(local_lilypond_datadir)/tex
 INSTALLATION_OUT_FILES2=$(shell kpsewhich geometry.sty)
 
-else
-
-local-install:
-       @echo skipping
-
-local-install-outfiles:
-       @echo skipping
-
 endif
 

diff --git a/cygwin/README b/cygwin/README
deleted file mode 100644 (file)
index 5ce4ffc..0000000
--- a/cygwin/README
+++ /dev/null
@@ -1,115 +0,0 @@
-LilyPond
-------------------------------------------
-LilyPond - The GNU music typesetter.
-
-To get started, visit:
-  http://www.lilypond.org/Documentation/windows/out-www/installing.html
-
-If you encounter any problems, visit:
-  http://www.lilypond.org/wiki?TroubleshootingWindows
-
-When it all works, head straight to the tutorial:
-  http://www.lilypond.org/Documentation/user/out-www/lilypond/Tutorial.html
-
-
-Runtime requirements:
-  cygwin-1.3.10 or newer
-  libguile14
-  bash
-  libiconv2
-  libintl2
-  libkpathsea3
-  python
-  tetex-bin
-  tetex-tiny or tetex-base
-
-Suggested:
-  XFree86-serv
-  emacs or vim
-  ghostscript-x11
-  rxvt
-  tetex-x11
-  and, in anticipation of a PostScript viewer for Cygwin, a native
-  Windows PostScript viewer such as GSView from
-  http://www.cs.wisc.edu/~ghost
-
-Build requirements:
-  cygwin-1.3.10 or newer
-  binutils-20011102 or newer
-  gcc-2.95.3-5 or newer
-  bison-1.35 or newer
-  guile-devel-1.5.6-5 or newer
-  fileutils
-  flex-2.5.4 or newer
-  libguile14-1.5.6-5 or newer
-  libkpathsea3-20020530-2 or newer
-  python-2.2 or newer
-  sed-3.02 or newer
-  sh-utils
-  tetex-devel-20020530-2 or newer
-  texinfo-4.2 or newer
-
-Website/documentation build requirements (lilypond-doc package):
-  tetex-bin
-  tetex-tiny or tetex-base
-  ghostscript or ghostscript-x11
-
-  mftrace, http://www.cs.uu.nl/people/hanwen/mftrace
-  autotrace, http://autotrace.sourceforge.net
-  netpbm, http://netpbm.sourceforge.net
-  t1utils, http://www.lcdf.org/~eddietwo/type/
-
-Recommended website/documentation build requirements:
-  pfaedit 020215 or newer, http://pfaedit.sourceforge.net
-
-Canonical homepage:
-  http://www.lilypond.org/development
-
-Canonical download:
-  ftp://ftp.lilypond.org/pub/LilyPond
-  
-------------------------------------
-
-Build instructions:
-
-  # Unpack lilypond-1.5.72-1-src.tar.bz2 in /usr/src
-
-    cd /usr/src
-    tar xjf lilypond-1.5.72-1-src.tar.bz2
-    # (or, if you use setup to install this src package, it will be
-    #  unpacked under /usr/src automatically)
-
-  # Get mknetrel from:
-     cvs -d:pserver:anoncvs@sources.redhat.com:/cvs/cygwin-apps co mknetrel
-
-  # Copy the extra mknetrel script for LilyPond to mknetrel:
-     cp lilypond-1.5.72-1/cygwin/mknetrel mknetrel/extra/lilypond
-
-  # Build the package:
-
-     ./mknetrel/bin/mknetrel lilypond
-
-This will create:
-
-This will create:
-  /usr/src/uploads/lilypond-1.5.72-1-src.tar.bz2
-  /usr/src/uploads/lilypond-1.5.72-1.tar.bz2
-  /usr/src/uploads/lilypond-doc/lilypond-doc-1.5.72-1.tar.bz2
-
-------------------
-
-Port notes:
-
-  These packages were built on GNU/Linux using mknetrel.
-
-  Jan Nieuwenhuizen
-  janneke@gnu.org
-
-Cygwin port maintained by: Jan Nieuwenhuizen  <janneke@gnu.org> 
-
-------------------
-
-Please send questions or comments on the LilyPond Cygwin package or
-installation to the Cygwin mailing list at: cygwin@cygwin.com.
-However, if you're having problems related to LilyPond, please write
-to lilypond-user@gnu.org.  Please do not email the authors directly.

diff --git a/cygwin/README.in b/cygwin/README.in
new file mode 100644 (file)
index 0000000..8afb888
--- /dev/null
+++ b/cygwin/README.in
@@ -0,0 +1,113 @@
+LilyPond
+------------------------------------------
+LilyPond - The GNU music typesetter.
+
+To get started, visit:
+  http://www.lilypond.org/Documentation/windows/out-www/installing.html
+
+If you encounter any problems, visit:
+  http://www.lilypond.org/wiki?TroubleshootingWindows
+
+When it all works, head straight to the tutorial:
+  http://www.lilypond.org/Documentation/user/out-www/lilypond/Tutorial.html
+
+
+Runtime requirements:
+  cygwin-1.3.10 or newer
+  libguile14
+  bash
+  libiconv2
+  libintl2
+  libkpathsea3
+  python
+  tetex-bin
+  tetex-tiny or tetex-base
+
+Suggested:
+  XFree86-serv
+  emacs or vim
+  ghostscript-x11
+  rxvt
+  tetex-x11
+  and, in anticipation of a PostScript viewer for Cygwin, a native
+  Windows PostScript viewer such as GSView from
+  http://www.cs.wisc.edu/~ghost
+
+Build requirements:
+  cygwin-1.3.10 or newer
+  binutils-20011102 or newer
+  gcc-2.95.3-5 or newer
+  bison-1.35 or newer
+  guile-devel-1.5.6-5 or newer
+  fileutils
+  flex-2.5.4 or newer
+  libguile14-1.5.6-5 or newer
+  libkpathsea3-20020530-2 or newer
+  python-2.2 or newer
+  sed-3.02 or newer
+  sh-utils
+  tetex-devel-20020530-2 or newer
+  texinfo-4.2 or newer
+
+Website/documentation build requirements (lilypond-doc package):
+  tetex-bin
+  tetex-tiny or tetex-base
+  ghostscript or ghostscript-x11
+
+  mftrace, http://www.cs.uu.nl/people/hanwen/mftrace
+  autotrace, http://autotrace.sourceforge.net
+  netpbm, http://netpbm.sourceforge.net
+  t1utils, http://www.lcdf.org/~eddietwo/type/
+
+Recommended website/documentation build requirements:
+  pfaedit 020215 or newer, http://pfaedit.sourceforge.net
+
+Canonical homepage:
+  http://www.lilypond.org/development
+
+Canonical download:
+  ftp://ftp.lilypond.org/pub/LilyPond
+  
+------------------------------------
+
+Build instructions:
+
+  # Unpack lilypond-@TOPLEVEL_VERSION@-1-src.tar.bz2 in /usr/src
+
+    cd /usr/src
+    tar xjf lilypond-@TOPLEVEL_VERSION@-1-src.tar.bz2
+    # (or, if you use setup to install this src package, it will be
+    #  unpacked under /usr/src automatically)
+
+  # Get mknetrel from:
+     cvs -d:pserver:anoncvs@sources.redhat.com:/cvs/cygwin-apps co mknetrel
+
+  # Copy the extra mknetrel script for LilyPond to mknetrel:
+     cp lilypond-@TOPLEVEL_VERSION@-1/cygwin/mknetrel mknetrel/extra/lilypond
+
+  # Build the package:
+
+     ./mknetrel/bin/mknetrel lilypond
+
+This will create:
+  /usr/src/uploads/lilypond-@TOPLEVEL_VERSION@-1-src.tar.bz2
+  /usr/src/uploads/lilypond-@TOPLEVEL_VERSION@-1.tar.bz2
+  /usr/src/uploads/lilypond-doc/lilypond-doc-@TOPLEVEL_VERSION@-1.tar.bz2
+
+------------------
+
+Port notes:
+
+  These packages were built on GNU/Linux using mknetrel.
+
+  Jan Nieuwenhuizen
+  janneke@gnu.org
+
+Cygwin port maintained by: Jan Nieuwenhuizen  <janneke@gnu.org> 
+
+------------------
+
+Please send questions or comments on the LilyPond Cygwin package or
+installation to the Cygwin mailing list at: cygwin@cygwin.com.
+However, if you're having problems related to LilyPond, please write
+to lilypond-user@gnu.org.  Please do not email the authors directly.

diff --git a/cygwin/mknetrel b/cygwin/mknetrel
index 537f6d393c22272cfb015e3d4885ece12c2b5a8e..83b101fb8cd96d025e771c5472fd9f043d7804c6 100644 (file)
--- a/cygwin/mknetrel
+++ b/cygwin/mknetrel
@@ -10,7 +10,7 @@
 # To use this, do something like:
 cat >/dev/null <<EOC
 
-   wget -P/var/tmp ftp://lilypond.org/pub/LilyPond/v1.5/lilypond-1.5.71.tar.gz
+   wget -P/var/tmp ftp://lilypond.org/pub/LilyPond/v1.5/lilypond-1.5.72.tar.gz
    rm -rf /home/netrel/src/lilypond-*
    mkdir -p /home/netrel/src && cd /home/netrel/src
    ## TODO: look at pimport
@@ -329,10 +329,10 @@ postinstall () {
     ## Cygwin readmes
     cygwin=cygwin
     cd $src || exit 1
-    install -m644 $cygwin/README $inst/$docdir/README.Cygwin
+    install -m644 $cygwin/out/README $inst/$docdir/README.Cygwin
     install -m644 $cygwin/changelog $inst/$docdir/changelog.Cygwin
     install -d -m755 $inst/$prefix/doc/Cygwin
-    install -m644 $cygwin/README $inst/$prefix/doc/Cygwin/$package.README
+    install -m644 $cygwin/out/README $inst/$prefix/doc/Cygwin/$package.README
 
     ## copy examples
     cd $src || exit 1