* scripts/mup2ly.py: Cut-n-paste include missing lilylib.

[lilypond.git] / stepmake / stepmake / generic-vars.make

diff --git a/stepmake/stepmake/generic-vars.make b/stepmake/stepmake/generic-vars.make
index 25186b1cd3ecc5383598a760c089d9b0baf48a1a..5a0302d9a091bd0c6a5b753a339842851d8dc367 100644 (file)
--- a/stepmake/stepmake/generic-vars.make
+++ b/stepmake/stepmake/generic-vars.make
@@ -4,21 +4,23 @@
 # internal, not normally used
 DEPTH = $(depth)/$(package-depth)
 
+#ifeq ($(topdir),)
+#abs-srcdir := $(shell cd $(depth); pwd)
+##deprecated
+#topdir := $(abs-srcdir)
+#endif
+pwd := $(shell pwd)
+
+ifeq ($(srcdir),.)
+src-depth = $(depth)
+else
+src-depth = $(srcdir)
+endif
+
 ifeq ($(topdir),)
-abs-srcdir := $(shell cd $(depth); pwd)
-#deprecated
+abs-srcdir := $(shell cd $(src-depth); pwd)
 topdir := $(abs-srcdir)
-abs-builddir := $(shell cd $(depth)/$(builddir); pwd)
 endif
-pwd := $(shell pwd)
-
-# $(depth) is deprecated, for most cases you'll want $(src-depth)
-#
-# Well, on second thought.
-# It can do no harm, but using src-depth iso depth is only necessary
-# for broken rules that do
-#    cd $(outdir) && foo  $(depth) ...
-src-depth = $(depth)/$(srcdir)
 
 # derived names
 ifeq ($(distdir),)
@@ -27,11 +29,6 @@ ifeq ($(distdir),)
 endif
 distname = $(package)-$(TOPLEVEL_VERSION)
 
-# obsolete?
-#makeout = $(depth)/make/$(outdir)
-#docout = $(depth)/Documentation/$(outdir)
-#binout = $(depth)/bin/$(outdir)
-
 doc-dir = $(src-depth)/Documentation
 po-dir = $(src-depth)/po