X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=make%2Fly.make;h=f9a3f212d447e64408b41f804065d934bd209750;hb=a9d9433bc7b95cb2d4b3d96eefce7a8437c0d44e;hp=3183a5867def04cf5c652f203f93b3a7395ddffa;hpb=4a8e0de294608542396e58761b305cdcd7fd6055;p=lilypond.git

diff --git a/make/ly.make b/make/ly.make
index 3183a5867d..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)
@@ -26,7 +26,7 @@ make-root?=$(wildcard /usr/local/share/lilypond/make)
 ifneq ($(make-root),)
 ### some versions apparently choke on $(message)
 ### $(message running from $(make-root))
-depth=$(make-root)/..
+depth:=$(make-root)/..
 LOCALSTEPMAKE_TEMPLATES=ly mutopia
 include $(make-root)/stepmake.make
 else
@@ -57,19 +57,19 @@ 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 $@
+#$(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,
 # or make `foo-book' to make out/foo-book.ps
 #
 %: $(outdir)/%.ps
-	@echo Making $@ from $<
+	@echo Generated $< for target $@.
 
 #
 # Also clean hand-compiled stuff in cwd