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 6a8729df5f670e847b0307cf3b1fc7b65bc80d49..fb75166e1ba61c35d0b1ad7e51237df30567bcfb 100644 (file)
--- a/stepmake/stepmake/generic-vars.make
+++ b/stepmake/stepmake/generic-vars.make
@@ -1,9 +1,7 @@
-top-build-dir = $(shell cd $(depth) && pwd)
-build-dir = $(shell cd . && pwd)
-tree-dir = $(subst $(top-build-dir),,$(build-dir))
-
-absdir = $(shell cd $(1) ; pwd)
+top-build-dir := $(realpath $(depth) )
+build-dir := $(realpath  . )
 
+tree-dir = $(subst $(top-build-dir),,$(build-dir))
 
 ifneq ($(configure-srcdir),.)
 srcdir-build = 1
@@ -15,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 = .
@@ -37,19 +35,15 @@ 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)/..
-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)),)
@@ -82,7 +76,6 @@ 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)
 
 #?
@@ -103,11 +96,6 @@ SOURCE_FILES += $(IN_FILES)
 # Preprocessed .in documentation _FILES:
 OUTIN_FILES = $(addprefix $(outdir)/, $(IN_FILES:%.in=%))
 
-# CSS source files are in a unique directory
-CSS_DIRECTORY = $(top-src-dir)/Documentation/css
-CSS_FILES := $(shell ls $(CSS_DIRECTORY)/*.css)
-OUT_CSS_FILES = $(CSS_FILES:$(CSS_DIRECTORY)/%.css=$(outdir)/%.css)
-
 ALL_SOURCES = $(SOURCE_FILES)
 
 ifeq (cygwin,$(findstring cygwin,$(HOST_ARCH)))