* SConstruct: Further development.

[lilypond.git] / make / stepmake.make

diff --git a/make/stepmake.make b/make/stepmake.make
index 3e7740506463e8d801bd519b2662b8c4fcea578b..666099ee2e5b3752920f1f1b5d87bb935dd49a61 100644 (file)
--- a/make/stepmake.make
+++ b/make/stepmake.make
@@ -26,12 +26,12 @@ else
 endif
 
 ifdef config
-  configuration=$(config)
+  config_make=$(config)
 else
   ifeq ($(builddir),)
-    configuration=$(depth)/config$(CONFIGSUFFIX).make
+    config_make=$(depth)/config$(CONFIGSUFFIX).make
   else
-    configuration=$(builddir)/config$(CONFIGSUFFIX).make
+    config_make=$(builddir)/config$(CONFIGSUFFIX).make
   endif
 endif
 
@@ -41,12 +41,12 @@ else
   outroot=$(builddir)/$(patsubst $(shell cd $(depth); pwd)%,%,$(pwd))
 endif
 
-include $(configuration)
+include $(config_make)
 
 outdir=$(outroot)/$(outbase)
 
 # why not generic ?? 
-config_h=$(builddir)/config$(CONFIGSUFFIX).h
+config_h=$(builddir)/config$(CONFIGSUFFIX).hh
 
 # The outdir that was configured for: best guess to find binaries
 outconfbase=out$(CONFIGSUFFIX)