From: hanwen <hanwen>
Date: Fri, 11 Nov 2005 15:13:51 +0000 (+0000)
Subject: ($(top-build-dir)/Documentation/pictures/$(outbase)/lilypond.ico):
X-Git-Tag: release/2.7.16~1
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=86826c44afae95495d45c43b8f0b543069130fce;p=lilypond.git

($(top-build-dir)/Documentation/pictures/$(outbase)/lilypond.ico):
make picture in builddir, not srcdir.
---

diff --git a/ChangeLog b/ChangeLog
index eb04958cc8..b9e467bcdd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-11-11  Han-Wen Nienhuys  <hanwen@xs4all.nl>
+
+	* lily/GNUmakefile
+	($(top-build-dir)/Documentation/pictures/$(outbase)/lilypond.ico):
+	make picture in builddir, not srcdir.
+
 2005-11-10  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
 	* scripts/lilypond-book.py (main): use commands.mkarg () to quote
diff --git a/lily/GNUmakefile b/lily/GNUmakefile
index 23b01b5808..23baceda3f 100644
--- a/lily/GNUmakefile
+++ b/lily/GNUmakefile
@@ -40,11 +40,13 @@ $(outdir)/lilypond: $(outdir)/lilypond.rc.o
 
 $(outdir)/lilypond.rc.o: $(outdir)/lilypond.ico $(outdir)/ly.ico
 $(top-build-dir)/Documentation/pictures/$(outbase)/lilypond.ico:
-	$(MAKE) -C $(top-src-dir)/Documentation/pictures
+	$(MAKE) -C $(top-build-dir)/Documentation/pictures
+
 $(outdir)/lilypond.ico: $(top-build-dir)/Documentation/pictures/$(outbase)/lilypond.ico
 	cp $< $@ 
 $(top-build-dir)/Documentation/pictures/$(outbase)/ly.ico:
-	$(MAKE) -C $(top-src-dir)/Documentation/pictures
+	$(MAKE) -C $(top-build-dir)/Documentation/pictures
+
 $(outdir)/ly.ico: $(top-build-dir)/Documentation/pictures/$(outbase)/ly.ico
 	cp $< $@ 
 endif