X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=stepmake%2Fstepmake%2Fgeneric-vars.make;h=b0fc521e931334a8f4c25867658fe183df7c4b7c;hb=6c323bc1bb27a79f687f5f3f3ed6b105aad24caa;hp=c61fa5ec82040fd1f1bac5c18333326dcb927990;hpb=ce0cc2e0056b7d88d9297a6ea08647179f70898a;p=lilypond.git diff --git a/stepmake/stepmake/generic-vars.make b/stepmake/stepmake/generic-vars.make index c61fa5ec82..b0fc521e93 100644 --- a/stepmake/stepmake/generic-vars.make +++ b/stepmake/stepmake/generic-vars.make @@ -24,6 +24,8 @@ 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))) @@ -35,17 +37,16 @@ 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 @@ -64,10 +65,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 @@ -78,7 +82,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) #?