release: 1.1.0

[lilypond.git] / make / stepmake.make

diff --git a/make/stepmake.make b/make/stepmake.make
index 835f6907a4fa21de789a015cccdda0c14adc3a49..07d293704e107cd0ba2a417d1153fb289c76a316 100644 (file)
--- a/make/stepmake.make
+++ b/make/stepmake.make
@@ -23,7 +23,7 @@ else
 outdir=out
 endif
 
-stepdir = $(depth)/$(stepmake)/stepmake
+stepdir = $(stepmake)/stepmake
 
 STEPMAKE_TEMPLATES := generic $(STEPMAKE_TEMPLATES) 
 LOCALSTEPMAKE_TEMPLATES:= generic $(LOCALSTEPMAKE_TEMPLATES)
@@ -31,6 +31,11 @@ LOCALSTEPMAKE_TEMPLATES:= generic $(LOCALSTEPMAKE_TEMPLATES)
 
 all:
 
+-include $(addprefix $(depth)/make/,$(addsuffix -inclusions.make, $(LOCALSTEPMAKE_TEMPLATES)))
+
+-include $(addprefix $(stepdir)/,$(addsuffix -inclusions.make, $(STEPMAKE_TEMPLATES)))
+
+
 include $(addprefix $(stepdir)/,$(addsuffix -vars.make, $(STEPMAKE_TEMPLATES)))
 
 # ugh. need to do this because of PATH :=$(topdir)/..:$(PATH)