X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=make%2Fly.make;h=f9a3f212d447e64408b41f804065d934bd209750;hb=212ca268e813cd72eca8c07e714e1b6669cba747;hp=3e8824f8100484c3de91581180db3646f6f3e70c;hpb=166b618065caa177005063b838f452ed801f20fe;p=lilypond.git diff --git a/make/ly.make b/make/ly.make index 3e8824f810..f9a3f212d4 100644 --- a/make/ly.make +++ b/make/ly.make @@ -10,14 +10,14 @@ # Magic: find and include LilyPond's StepMake rules # # 0: try local tree -# 1: follow LILYPONDPREFIX +# 1: follow LILYPOND_DATADIR # 2: try source tree in home # 3: try installed tree in $HOME # 4: try system installed tree # 5: try system installed tree # make-root=$(wildcard $(depth)/make) -make-root?=$(wildcard $(LILYPONDPREFIX)/make) +make-root?=$(wildcard $(LILYPOND_DATADIR)/make) make-root?=$(wildcard $(HOME)/usr/src/lilypond/make) make-root?=$(wildcard $(HOME)/usr/share/lilypond/make) make-root?=$(wildcard /usr/share/lilypond/make) @@ -57,13 +57,12 @@ examples= # mutopia-examples=$(name) $(parts) -# +# moved to ly-rules.make # Timothy's booklet # -$(outdir)/%-book.ps: $(outdir)/%.ps - psbook $< $<.tmp -# pstops '2:0L(11.45in,0.25in)+1L(11.45in,5.6in)' $<.tmp $@ - pstops '2:0L@.7(21cm,0)+1L@.7(21cm,14.85cm)' $<.tmp $@ +#$(outdir)/%-book.ps: $(outdir)/%.ps +# psbook $< $<.tmp +# pstops '2:0L@.7(21cm,0)+1L@.7(21cm,14.85cm)' $<.tmp $@ # # Catch-all target: type `make foo' to make out/foo.ps,