* input/test/ambitus-mixed.ly (texidoc): new file.

[lilypond.git] / make / stepmake.make

diff --git a/make/stepmake.make b/make/stepmake.make
index 3e7740506463e8d801bd519b2662b8c4fcea578b..c73d4451be3c63af75059d0a5c30aeb47e60d480 100644 (file)
--- a/make/stepmake.make
+++ b/make/stepmake.make
@@ -1,7 +1,6 @@
 # make/Stepmake.make
 
 include $(depth)/make/toplevel-version.make
-
 # Use alternate configurations alongside eachother:
 #
 #     ./configure --enable-config=debug
@@ -26,12 +25,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,7 +40,8 @@ else
   outroot=$(builddir)/$(patsubst $(shell cd $(depth); pwd)%,%,$(pwd))
 endif
 
-include $(configuration)
+include $(depth)/VERSION
+include $(config_make)
 
 outdir=$(outroot)/$(outbase)