X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=make%2Fly.make;h=f9a3f212d447e64408b41f804065d934bd209750;hb=1dbfe58548c0dbea3a09c94eb03113aaaaa73c75;hp=f3a595d95d9a726fd2b22e6b1088c542dd92812f;hpb=13fa4b98f628bdb74f82cdc70fc328dbf118b659;p=lilypond.git

diff --git a/make/ly.make b/make/ly.make
index f3a595d95d..f9a3f212d4 100644
--- a/make/ly.make
+++ b/make/ly.make
@@ -9,20 +9,24 @@
 #
 # Magic: find and include LilyPond's StepMake rules
 #
-# 0: follow LILYPONDPREFIX
-# 1: try source tree
-# 2: try installed tree in $HOME
-# 3: try system installed tree
-#
-make-root=$(wildcard $(LILYPONDPREFIX)/make)
+# 0: try local tree
+# 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 $(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)
-make-root?=$(wildcard /usr/share/lilypond/make)
+make-root?=$(wildcard /usr/local/share/lilypond/make)
 #make-root=<LilyPond's datadir>/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
@@ -53,24 +57,24 @@ 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
 #
-localclean: local-auto-gen-clean
+local-clean: local-auto-gen-clean
 
 # Compose string from two parts: must not remove myself.
 auto-gen-tag=Generated