From b05a56d4df2bb7e478eae210e0b210204477555b Mon Sep 17 00:00:00 2001 From: fred Date: Sun, 24 Mar 2002 19:35:03 +0000 Subject: [PATCH] lilypond-0.0.42 --- bin/Makefile | 4 ++-- bin/make_patch | 5 ++++- input/Makefile | 2 +- lib/include/Makefile | 2 +- lily/include/Makefile | 2 +- 5 files changed, 9 insertions(+), 6 deletions(-) diff --git a/bin/Makefile b/bin/Makefile index e9f5521e5e..c1c0767811 100644 --- a/bin/Makefile +++ b/bin/Makefile @@ -5,7 +5,7 @@ depth = .. # -build = ./$(depth)/lily/.build +build = ./$(depth)/lily/$(outdir)/.build # generic stuff/Makefile # @@ -14,7 +14,7 @@ include ./$(depth)/make/Stuff.make # list of distribution files: # -SCRIPTS = clearlily cpgento genheader make_patch make_fversion make_version make_website +SCRIPTS = clearlily cpgento genheader make_patch make_version make_website DISTFILES = Makefile $(SCRIPTS) # diff --git a/bin/make_patch b/bin/make_patch index f74f1ea0cd..8ec7326f7b 100755 --- a/bin/make_patch +++ b/bin/make_patch @@ -37,5 +37,8 @@ fi #(cd $nm$old; touch depend; make clean) #(cd $nm$new; touch depend; make clean) -(cd $nm$new; diff -urP ../$nm$old . > ../patch-$new) + +echo 'use cd source-dir; patch -E -p0 < this_patch'> patch-$new + +(cd $nm$new; diff -urN ../$nm$old . >> ../patch-$new) rm -rf $nm$old $nm$new diff --git a/input/Makefile b/input/Makefile index 618e1ec24a..94970aa5c0 100644 --- a/input/Makefile +++ b/input/Makefile @@ -5,7 +5,7 @@ depth = .. # -build = ./$(depth)/lily/.build +build = ./$(depth)/lily/$(outdir)/.build # generic stuff/Makefile # diff --git a/lib/include/Makefile b/lib/include/Makefile index cb4f4ea6d1..7477d7a316 100644 --- a/lib/include/Makefile +++ b/lib/include/Makefile @@ -13,7 +13,7 @@ MINOR_VERSION = $(TOPLEVEL_MINOR_VERSION) PATCH_LEVEL = $(TOPLEVEL_PATCH_LEVEL) # use to send patches, always empty for released version: MY_PATCH_LEVEL = $(TOPLEVEL_MY_PATCH_LEVEL) -build = ./$(depth)/lily/.build +build = ./$(depth)/lily/$(outdir)/.build # # generic stuff/Makefile diff --git a/lily/include/Makefile b/lily/include/Makefile index fa2827b30a..89f5b189e5 100644 --- a/lily/include/Makefile +++ b/lily/include/Makefile @@ -13,7 +13,7 @@ MINOR_VERSION = $(TOPLEVEL_MINOR_VERSION) PATCH_LEVEL = $(TOPLEVEL_PATCH_LEVEL) # use to send patches, always empty for released version: MY_PATCH_LEVEL = $(TOPLEVEL_MY_PATCH_LEVEL) -build = ./$(depth)/lily/.build +build = ./$(depth)/lily/$(outdir)/.build # # generic stuff/Makefile -- 2.39.5