($(top-build-dir)/Documentation/pictures/$(outbase)/lilypond.ico):

make picture in builddir, not srcdir.

diff --git a/ChangeLog b/ChangeLog
index eb04958cc879f3505d88a9198634f234d4806735..b9e467bcddcf11d3b7d1ef15755f85ddd64e1e2e 100644 (file)
--- 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 23b01b580809b43bc42b3d56f8ce651fadf74de6..23baceda3faf540ab26ca8209a58276bddc7b166 100644 (file)
--- 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