patch::: 1.3.137.jcn3

[lilypond.git] / make / stepmake.make

diff --git a/make/stepmake.make b/make/stepmake.make
index 92ce216398ec3de92873319940397991d000b68d..6d25f54696926dc714e0cc60fe774e471c46cc2e 100644 (file)
--- a/make/stepmake.make
+++ b/make/stepmake.make
@@ -2,15 +2,10 @@
 
 include $(depth)/make/toplevel-version.make
 
-# Don't try to outsmart us, you puny computer!
-ifeq (0,${MAKELEVEL})
-  MAKE:=$(MAKE) --no-builtin-rules
-endif
-.SUFFIXES:
 
 # Use alternate configurations alongside eachother:
 #
-#     ./configure --enable-configsuffix=debug
+#     ./configure --enable-config=debug
 #     make conf=debug
 #
 # uses config-debug.make and config-debug.h; output goes to out-debug.
@@ -47,7 +42,7 @@ endif
 include $(configuration)
 
 ifeq ($(builddir),.)
-  outroot=.
+  outroot=$(builddir)
 else
   outroot=$(depth)/$(builddir)/$(patsubst $(shell cd $(depth); pwd)%,%,$(shell cd .; pwd))
 endif
@@ -55,6 +50,10 @@ endif
 outdir=$(outroot)/$(outbase)
 config_h=$(depth)/$(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
 # for stepmake package
@@ -63,6 +62,14 @@ stepdir = $(stepmake)/stepmake
 STEPMAKE_TEMPLATES := generic $(STEPMAKE_TEMPLATES) 
 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})
+  MAKE:=$(MAKE) --no-builtin-rules
+  include $(stepdir)/no-builtin-rules.make
+endif
+.SUFFIXES:
 
 all: