From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Mon, 20 Feb 2006 15:23:57 +0000 (+0000)
Subject: ($(outdir)/%.png $(outdir)/%.pdf
X-Git-Tag: release/2.7.36~30
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=d99aa3d1b8125a66138b5ffd7be359314d5a618a;p=lilypond.git

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

diff --git a/ChangeLog b/ChangeLog
index 92cf93e00e..aa9856f89e 100644
--- 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 23d39b8a41..bea10ab98e 100644
--- 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 cbacdaa0c7..b39307d29a 100644
--- 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