* stepmake/aclocal.m4:

[lilypond.git] / make / stepmake.make

diff --git a/make/stepmake.make b/make/stepmake.make
index 9cfe90e50c1395d097baaa23757fcce9f7b13d0e..dee7d048351c3dd8bbd3c5ca873866f1c4831d92 100644 (file)
--- a/make/stepmake.make
+++ b/make/stepmake.make
@@ -2,7 +2,6 @@
 
 include $(depth)/make/toplevel-version.make
 
-
 # Use alternate configurations alongside eachother:
 #
 #     ./configure --enable-config=debug
@@ -27,28 +26,31 @@ else
 endif
 
 ifdef config
-  configuration=$(config)
+  config_make=$(config)
 else
-  ifeq ($(builddir),.)
-    configuration=$(depth)/config$(CONFIGSUFFIX).make
+  ifeq ($(builddir),)
+    config_make=$(depth)/config$(CONFIGSUFFIX).make
   else
-    # user package
-    configuration=$(depth)/$(builddir)/config$(CONFIGSUFFIX).make
-    # stepmake package
-    #configuration=$(depth)/../$(builddir)/stepmake/config$(CONFIGSUFFIX).make
+    config_make=$(builddir)/config$(CONFIGSUFFIX).make
   endif
 endif
 
-include $(configuration)
-
-ifeq ($(builddir),.)
+ifeq ($(builddir),)
   outroot=.
 else
-  outroot=$(depth)/$(builddir)/$(patsubst $(shell cd $(depth); pwd)%,%,$(shell cd .; pwd))
+  outroot=$(builddir)/$(patsubst $(shell cd $(depth); pwd)%,%,$(pwd))
 endif
 
+include $(config_make)
+
 outdir=$(outroot)/$(outbase)
-config_h=$(depth)/$(builddir)/config$(CONFIGSUFFIX).h
+
+# why not generic ?? 
+config_h=$(builddir)/config$(CONFIGSUFFIX).h
+
+# The outdir that was configured for: best guess to find binaries
+outconfbase=out$(CONFIGSUFFIX)
+outconfdir=$(outroot)/$(outconfbase)
 
 # user package
 stepdir = $(stepmake)/stepmake
@@ -61,7 +63,8 @@ LOCALSTEPMAKE_TEMPLATES:= generic $(LOCALSTEPMAKE_TEMPLATES)
 # Don't try to outsmart us, you puny computer!
 # Well, UGH.  This only removes builtin rules from
 # subsequent $(MAKE)s, *not* from the current run!
-ifeq (0,${MAKELEVEL})
+ifeq ($(BUILTINS_REMOVED),)
+  export BUILTINS_REMOVED = yes
   MAKE:=$(MAKE) --no-builtin-rules
   include $(stepdir)/no-builtin-rules.make
 endif