patch::: 1.3.104.jcn1

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

diff --git a/stepmake/stepmake/generic-vars.make b/stepmake/stepmake/generic-vars.make
index 3fe7ed8dfb7660bb03c78aa5c4f3fabae950a0ef..4bebe73e922919738688b6391d30f78f2693be8c 100644 (file)
--- a/stepmake/stepmake/generic-vars.make
+++ b/stepmake/stepmake/generic-vars.make
@@ -10,39 +10,42 @@
 # directory names:
 
 # depth from group-dir
-# not eh, normally used
+# internal, not normally used
 DEPTH = $(depth)/$(package-depth)
 
-# topdir := $(shell cd $(depth); pwd)
 ifeq ($(topdir),)
 topdir := $(shell cd $(depth); 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),)
-#  distdir = $(depth)/$(outdir)/$(DIST_NAME)
-# must be absolute for 'make dist' with installed stepmake
   distdir = $(topdir)/$(outdir)/$(DIST_NAME)
   DIST_NAME = $(package)-$(TOPLEVEL_VERSION)
 endif
 distname = $(package)-$(TOPLEVEL_VERSION)
 
 # obsolete?
-makeout = $(depth)/make/$(outdir)
-docout = $(depth)/Documentation/$(outdir)
-binout = $(depth)/bin/$(outdir)
+#makeout = $(depth)/make/$(outdir)
+#docout = $(depth)/Documentation/$(outdir)
+#binout = $(depth)/bin/$(outdir)
 
-doc-dir = $(depth)/Documentation
-po-dir = $(depth)/po
+doc-dir = $(src-depth)/Documentation
+po-dir = $(src-depth)/po
 
 # sort-out which of these are still needed
 #
 $(package)_bindir = $(depth)/bin
 step-bindir = $(stepmake)/bin
-# deprecated
-# abs-step-bindir = $(topdir)/$(stepmake)/bin
-#
+
 group-dir = $(shell cd $(DEPTH)/..; pwd)
 release-dir = $(group-dir)/releases
 patch-dir = $(group-dir)/patches
@@ -110,7 +113,7 @@ DODEP=rm -f $(depfile); DEPENDENCIES_OUTPUT="$(depfile) $(outdir)/$(notdir $@)"
 # generic target names:
 #
 ifdef NAME
-EXECUTABLE = $(outdir)/$(NAME)$(EXE)
+EXECUTABLE = $(outdir)/$(NAME)
 else
 EXECUTABLE =
 endif
@@ -136,5 +139,8 @@ endif
 DO_STRIP=true
 LOOP=$(foreach i,  $(SUBDIRS), $(MAKE) PACKAGE=$(PACKAGE) -C $(i) $@ &&) true
 
+ETAGS_FLAGS=-CT
+CTAGS_FLAGS=-h
 
 include $(stepdir)/files.make
+