Issue 5167/6: Changes: show \markup xxx = ... \etc assignments

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

diff --git a/stepmake/stepmake/generic-vars.make b/stepmake/stepmake/generic-vars.make
index 180d8a93fc40600f0970327abefe6f336b684eca..fb75166e1ba61c35d0b1ad7e51237df30567bcfb 100644 (file)
--- a/stepmake/stepmake/generic-vars.make
+++ b/stepmake/stepmake/generic-vars.make
@@ -1,5 +1,6 @@
-top-build-dir = $(shell cd $(depth) && pwd)
-build-dir = $(shell cd . && pwd)
+top-build-dir := $(realpath $(depth) )
+build-dir := $(realpath  . )
+
 tree-dir = $(subst $(top-build-dir),,$(build-dir))
 
 ifneq ($(configure-srcdir),.)
@@ -12,7 +13,7 @@ else
 src-depth = $(configure-srcdir)
 endif
 
-top-src-dir := $(shell cd $(src-depth); pwd)
+top-src-dir := $(realpath $(src-depth))
 
 ifndef srcdir-build
 src-dir = .
@@ -21,31 +22,28 @@ src-dir = $(top-src-dir)$(tree-dir)
 VPATH = $(src-dir)
 endif
 
+abs-src-dir = $(top-src-dir)$(tree-dir)
+
 .UNEXPORT: build-dir src-dir tree-dir
 
 src-wildcard = $(subst $(src-dir)/,,$(wildcard $(src-dir)/$(1)))
 
 ifeq ($(distdir),)
-  distdir = $(top-src-dir)/$(outdir)/$(DIST_NAME)
+  distdir = $(top-build-dir)/$(outdir)/$(DIST_NAME)
   DIST_NAME = $(package)-$(TOPLEVEL_VERSION)
 endif
 distname = $(package)-$(TOPLEVEL_VERSION)
 
 doc-dir = $(src-depth)/Documentation
-po-dir = $(src-depth)/po
-step-bindir = $(stepmake)/bin
+po-srcdir = $(src-depth)/po
+po-outdir = $(depth)/po/$(outdir)
 
 # stepmake package support.
 DEPTH = $(depth)/$(package-depth)
 
-INSTALLPY=$(PYTHON) $(step-bindir)/install.py -c
+INSTALLPY=$(buildscript-dir)/install -c
 INSTALL=$(INSTALLPY)
 
-group-dir = $(shell cd $(DEPTH);pwd)/..
-release-dir = $(group-dir)/releases
-patch-dir = $(group-dir)/patches
-rpm-sources = $(release-dir)
-rpm-build = $(group-dir)/RedHat/BUILD
 package-icon = $(outdir)/$(package)-icon.xpm
 
 ifneq ($(strip $(MY_PATCH_LEVEL)),)
@@ -61,10 +59,13 @@ TOPLEVEL_VERSION=$(TOPLEVEL_MAJOR_VERSION).$(TOPLEVEL_MINOR_VERSION).$(TOPLEVEL_
 endif
 
 
-# no local settings in the build process.
+# no locale settings in the build process.
 LANG=
 export LANG
 
+
+INFO_DIRECTORIES = Documentation
+
 # clean file lists:
 #
 ERROR_LOG = 2> /dev/null
@@ -75,18 +76,17 @@ INCLUDES = $(src-dir)/include $(outdir) $($(PACKAGE)_INCLUDES) $(MODULE_INCLUDES
 
 M4 = m4
 
-DIST_FILES=$(EXTRA_DIST_FILES) GNUmakefile $(ALL_SOURCES) $(call src-wildcard,SConscript)
 DOCDIR=$(depth)/$(outdir)
 
 #?
-STRIPDEBUG=true 
+STRIPDEBUG=true
 STRIP=strip --strip-debug
 DO_STRIP=true
 
-LOOP=$(foreach i,  $(SUBDIRS), $(MAKE) PACKAGE=$(PACKAGE) package=$(package) -C $(i) $@ &&) true
+LOOP=+$(foreach i, $(SUBDIRS), $(MAKE) PACKAGE=$(PACKAGE) package=$(package) -C $(i) $@ &&) true
 
 ETAGS_FLAGS =
-CTAGS_FLAGS = 
+CTAGS_FLAGS =
 
 makeflags=$(patsubst %==, %, $(patsubst ---%,,$(patsubst ----%,,$(MAKEFLAGS:%=--%))))
 
@@ -98,10 +98,6 @@ OUTIN_FILES = $(addprefix $(outdir)/, $(IN_FILES:%.in=%))
 
 ALL_SOURCES = $(SOURCE_FILES)
 
-# Check if we are building for Cygwin
-#
-HOST_ARCH=$(shell $(CC) -dumpmachine)
-
 ifeq (cygwin,$(findstring cygwin,$(HOST_ARCH)))
 CYGWIN_BUILD = yes
 endif