From 77fe21c1a8b8bd250a824525183ece3c36d81431 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Fri, 6 Jan 2006 09:33:39 +0000 Subject: [PATCH] * make/ly-rules.make: * make/mutopia-rules.make: Use LILYPOND_BINARY (WAS: LILYPOND, but that seems to be gone). Fixes make web. --- ChangeLog | 6 ++++++ make/lilypond-vars.make | 2 +- make/ly-rules.make | 6 +++--- make/mutopia-rules.make | 2 +- 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index c7c5c2141a..b2aabf4ce6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 2006-01-06 Jan Nieuwenhuizen + * make/ly-rules.make: + * make/mutopia-rules.make: Use LILYPOND_BINARY (WAS: LILYPOND, but + that seems to be gone). Fixes make web. + + * The grand 2005-2006 replace. + * VERSION (MY_PATCH_LEVEL): Stay on .26 for now. 2006-01-05 Han-Wen Nienhuys diff --git a/make/lilypond-vars.make b/make/lilypond-vars.make index c9b67de1ec..13d5e46262 100644 --- a/make/lilypond-vars.make +++ b/make/lilypond-vars.make @@ -25,6 +25,6 @@ LILYPOND_BOOK_FLAGS = --process="$(LILYPOND_BINARY) --verbose --backend=eps --fo #texi-html for www only: LILYPOND_BOOK_FORMAT=$(if $(subst out-www,,$(notdir $(outdir))),texi,texi-html) -LY2DVI = $(LILYPOND) +LY2DVI = $(LILYPOND_BINARY) LYS_TO_TELY = $(buildscript-dir)/lys-to-tely.py diff --git a/make/ly-rules.make b/make/ly-rules.make index 902c7a081d..1a87a795cf 100644 --- a/make/ly-rules.make +++ b/make/ly-rules.make @@ -2,18 +2,18 @@ $(outdir)/%.latex $(outdir)/%.psfonts: %.doc - $(PYTHON) $(LILYPOND_BOOK) $(LILYPOND_BOOK_INCLUDES) --process='$(LILYPOND) $(LILYPOND_BOOK_INCLUDES)' --output=$(outdir) --verbose $(LILYPOND_BOOK_FLAGS) $< + $(PYTHON) $(LILYPOND_BOOK) $(LILYPOND_BOOK_INCLUDES) --process='$(LILYPOND_BINARY) $(LILYPOND_BOOK_INCLUDES)' --output=$(outdir) --verbose $(LILYPOND_BOOK_FLAGS) $< # don't do ``cd $(outdir)'', and assume that $(outdir)/.. is the src dir. # it is not, for --srcdir builds $(outdir)/%.texi: %.tely rm -f $$(grep -LF '% eof' $(outdir)/lily-*systems.tex 2>/dev/null) - $(PYTHON) $(LILYPOND_BOOK) --psfonts $(LILYPOND_BOOK_INCLUDES) --process='$(LILYPOND) $(LILYPOND_BOOK_INCLUDES)' --output=$(outdir) --format=$(LILYPOND_BOOK_FORMAT) --verbose $(LILYPOND_BOOK_FLAGS) $< + $(PYTHON) $(LILYPOND_BOOK) --psfonts $(LILYPOND_BOOK_INCLUDES) --process='$(LILYPOND_BINARY) $(LILYPOND_BOOK_INCLUDES)' --output=$(outdir) --format=$(LILYPOND_BOOK_FORMAT) --verbose $(LILYPOND_BOOK_FLAGS) $< $(outdir)/%.texi: $(outdir)/%.tely rm -f $$(grep -LF '% eof' $(outdir)/lily-*systems.tex 2>/dev/null) - $(PYTHON) $(LILYPOND_BOOK) --psfonts $(LILYPOND_BOOK_INCLUDES) --process='$(LILYPOND) $(LILYPOND_BOOK_INCLUDES)' --output=$(outdir) --format=$(LILYPOND_BOOK_FORMAT) --verbose $(LILYPOND_BOOK_FLAGS) $< + $(PYTHON) $(LILYPOND_BOOK) --psfonts $(LILYPOND_BOOK_INCLUDES) --process='$(LILYPOND_BINARY) $(LILYPOND_BOOK_INCLUDES)' --output=$(outdir) --format=$(LILYPOND_BOOK_FORMAT) --verbose $(LILYPOND_BOOK_FLAGS) $< # # DON'T REMOVE SOURCE FILES, otherwise the .TEXI ALWAYS OUT OF DATE. # rm -f $< diff --git a/make/mutopia-rules.make b/make/mutopia-rules.make index 934b9464e0..f3bc79bd6a 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) --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 $(shell pwd)/ $(notdir $<) touch $(outdir)/$(basename $(notdir $<)).png $(outdir)/%.ly: %.ly -- 2.39.2