From b9ba66711a09e353236676efedceb3f47148e16b Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Mon, 12 Aug 2002 18:19:02 +0000 Subject: [PATCH] * cygwin/README.in: New file. --- ChangeLog | 2 ++ VERSION | 2 +- cygwin/GNUmakefile | 14 +++----------- cygwin/{README => README.in} | 14 ++++++-------- cygwin/mknetrel | 6 +++--- 5 files changed, 15 insertions(+), 23 deletions(-) rename cygwin/{README => README.in} (87%) diff --git a/ChangeLog b/ChangeLog index 77c9888a6c..9199c4c8e9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ 2002-08-12 Jan Nieuwenhuizen + * cygwin/README.in: New file. + * input/sondag-morgen/GNUmakefile: * input/mutopia/R.Schumann/GNUmakefile: New file. diff --git a/VERSION b/VERSION index 0c9a700a46..42c4d31e6e 100644 --- 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 e5610e3777..4fa21e4099 100644 --- 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.in similarity index 87% rename from cygwin/README rename to cygwin/README.in index 5ce4ffc958..8afb8882cf 100644 --- a/cygwin/README +++ b/cygwin/README.in @@ -72,10 +72,10 @@ Canonical download: Build instructions: - # Unpack lilypond-1.5.72-1-src.tar.bz2 in /usr/src + # Unpack lilypond-@TOPLEVEL_VERSION@-1-src.tar.bz2 in /usr/src cd /usr/src - tar xjf lilypond-1.5.72-1-src.tar.bz2 + 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) @@ -83,18 +83,16 @@ Build instructions: 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 + cp lilypond-@TOPLEVEL_VERSION@-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 + /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 ------------------ diff --git a/cygwin/mknetrel b/cygwin/mknetrel index 537f6d393c..83b101fb8c 100644 --- a/cygwin/mknetrel +++ b/cygwin/mknetrel @@ -10,7 +10,7 @@ # To use this, do something like: cat >/dev/null <