X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2FGNUmakefile;h=f525d1fc7c5d1cbd71a3aefac0c2ac25718044e4;hb=078703a6ab29f75983a55ac2cc35fe5f315da574;hp=04ad56acf4a2dfa80adad517e569933d2576eb2c;hpb=75e2b24fabd5962901580b0d3627cee6b0aa41c1;p=lilypond.git

diff --git a/lily/GNUmakefile b/lily/GNUmakefile
index 04ad56acf4..f525d1fc7c 100644
--- a/lily/GNUmakefile
+++ b/lily/GNUmakefile
@@ -29,7 +29,7 @@ endif
 
 # for profiling, link guile statically:
 #
-# USER_LDFLAGS += -static -lltdl -ldl
+# CONFIG_LDFLAGS += -static -lltdl -ldl
 #
 
 ifeq ($(PLATFORM_WINDOWS),yes)
@@ -38,13 +38,13 @@ O_FILES += $(outdir)/lilypond.rc.o
 $(outdir)/lilypond: $(outdir)/lilypond.rc.o
 
 $(outdir)/lilypond.rc.o: $(outdir)/lilypond.ico $(outdir)/ly.ico
-$(builddir)/Documentation/pictures/$(outbase)/lilypond.ico:
-	$(MAKE) -C $(abs-srcdir)/Documentation/pictures
-$(outdir)/lilypond.ico: $(builddir)/Documentation/pictures/$(outbase)/lilypond.ico
+$(top-build-dir)/Documentation/pictures/$(outbase)/lilypond.ico:
+	$(MAKE) -C $(top-src-dir)/Documentation/pictures
+$(outdir)/lilypond.ico: $(top-build-dir)/Documentation/pictures/$(outbase)/lilypond.ico
 	cp $< $@ 
-$(builddir)/Documentation/pictures/$(outbase)/ly.ico:
-	$(MAKE) -C $(abs-srcdir)/Documentation/pictures
-$(outdir)/ly.ico: $(builddir)/Documentation/pictures/$(outbase)/ly.ico
+$(top-build-dir)/Documentation/pictures/$(outbase)/ly.ico:
+	$(MAKE) -C $(top-src-dir)/Documentation/pictures
+$(outdir)/ly.ico: $(top-build-dir)/Documentation/pictures/$(outbase)/ly.ico
 	cp $< $@ 
 endif
 
@@ -83,7 +83,12 @@ local-po: $(outdir)/parser.cc
 
 # ugh.  For --srcdir builds, these must exist to satisfy their broken
 # lexer.dep and parser.dep file entries.
-ifneq ($(srcdir), .)
+ifneq ($(configure-srcdir),.)
 .PRECIOUS: $(outdir)/lexer.cc $(outdir)/parser.cc
 endif
 
+
+foe:
+	@echo b:$(build-dir)
+	@echo s:$(src-dir)
+	@echo t:$(tree-dir)