lilypond-0.0.42

diff --git a/bin/Makefile b/bin/Makefile
index e9f5521e5eea6c2730c854c6e7c6a593bae6b80e..c1c076781183d73a953d2074a7690bf69b23e1b2 100644 (file)
--- 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 f74f1ea0cdbee74d2d9c75bb2cd128ccc5f0c2dd..8ec7326f7b9c786f88efb4caacd34eb5180f2402 100755 (executable)
--- 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 618e1ec24ad3202e74b6d7395b14f844f7f423ed..94970aa5c0d348288246a7284271b4990e6f3b1b 100644 (file)
--- 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 cb4f4ea6d17bd88c5b0ee24fafa85d3f6cdabf5d..7477d7a316d901f978833edac92eaf9a631e06f0 100644 (file)
--- 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 fa2827b30ad2f1df684ba2ed0401b11a60630371..89f5b189e556eeffc45543cc1ca612fe6d33ad0f 100644 (file)
--- 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