($(outdir)/%.png $(outdir)/%.pdf

$(outdir)/%.ly $(outdir)/%.ps): use $(srcdir) iso $(shell pwd).

diff --git a/ChangeLog b/ChangeLog
index 92cf93e00e3467e95ea687dd68c27611e50d8b23..aa9856f89ed0c952d76eaabd2dc7af0d83e8f796 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2006-02-20  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
+       * make/mutopia-rules.make ($(outdir)/%.png $(outdir)/%.pdf
+       $(outdir)/%.ly $(outdir)/%.ps): use $(srcdir) iso $(shell pwd).
+
        * make/lysdoc-rules.make ($(outdir)/collated-files.tely): use
        $(buildscript-dir) iso. absolute depth.
 

diff --git a/make/lilypond-vars.make b/make/lilypond-vars.make
index 23d39b8a41e309a550fc426cabd13a322c88721f..bea10ab98effab35ff5d2a67161932fe90eda24a 100644 (file)
--- a/make/lilypond-vars.make
+++ b/make/lilypond-vars.make
@@ -23,7 +23,7 @@ the-script-dir=$(wildcard $(script-dir))
 ABC2LY = $(script-dir)/abc2ly.py
 CONVERT_LY = $(script-dir)/convert-ly.py
 LILYPOND_BOOK = $(script-dir)/lilypond-book.py
-LILYPOND_BOOK_INCLUDES = -I $(src-dir)/ -I $(outdir) -I$(input-dir) -I $(input-dir)/regression/ -I $(input-dir)/test/ -I $(input-dir)/tutorial/ -I $(top-build-dir)/mf/$(outconfbase)/  -I $(top-build-dir)/mf/out/
+LILYPOND_BOOK_INCLUDES = -I $(src-dir)/ -I $(outdir) -I $(input-dir) -I $(input-dir)/regression/ -I $(input-dir)/test/ -I $(input-dir)/tutorial/ -I $(top-build-dir)/mf/$(outconfbase)/  -I $(top-build-dir)/mf/out/
 LILYPOND_BOOK_LILYPOND_FLAGS=-dgs-font-load
 LILYPOND_BOOK_FLAGS = --process="$(LILYPOND_BINARY) --verbose --backend=eps --formats=ps,png --header=texidoc -I $(top-src-dir)/input/test -dinternal-type-checking -danti-alias-factor=2 $(LILYPOND_BOOK_LILYPOND_FLAGS)"
 

diff --git a/make/mutopia-rules.make b/make/mutopia-rules.make
index cbacdaa0c7ab74e16abf2497e8664408b4692274..b39307d29a43c11aa9453fc24428c65dbfac2cf4 100644 (file)
--- a/make/mutopia-rules.make
+++ b/make/mutopia-rules.make
@@ -15,7 +15,7 @@ $(outdir)/%.ly: %.abc
 
 # hmm. notdir builds src-dir builds?
 $(outdir)/%.png $(outdir)/%.pdf $(outdir)/%.ly $(outdir)/%.ps: $(outdir)/%.ly
-       cd $(outdir); $(LILYPOND_BINARY) --pdf --png -danti-alias-factor=2 -ddelete-intermediate-files -dno-point-and-click -I $(shell pwd)/ $(notdir $<)
+       cd $(outdir); $(LILYPOND_BINARY) --pdf --png -danti-alias-factor=2 -ddelete-intermediate-files -dno-point-and-click -I $(src-dir)/ $(notdir $<)
        touch $(outdir)/$(basename $(notdir $<)).png
 
 $(outdir)/%.ly: %.ly