X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=stepmake%2Fstepmake%2Fgeneric-vars.make;h=da7d7047562b99ea6376473e5ea71560684ad987;hb=c20fff645e325d392d2588721144f4204d0ef9da;hp=8f8e2362f60fcba446fb699b98948968adaabca9;hpb=2dec849eecb8d2376174599aeb9cd5d4fda26828;p=lilypond.git

diff --git a/stepmake/stepmake/generic-vars.make b/stepmake/stepmake/generic-vars.make
index 8f8e2362f6..da7d704756 100644
--- a/stepmake/stepmake/generic-vars.make
+++ b/stepmake/stepmake/generic-vars.make
@@ -2,6 +2,9 @@ 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)
+
+
 ifneq ($(configure-srcdir),.)
 srcdir-build = 1
 endif
@@ -21,25 +24,30 @@ 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
+po-srcdir = $(src-depth)/po
+po-outdir = $(depth)/po/$(outdir)
 step-bindir = $(stepmake)/bin
 
 # stepmake package support.
 DEPTH = $(depth)/$(package-depth)
 
+INSTALLPY=$(PYTHON) $(step-bindir)/install.py -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
@@ -58,10 +66,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
@@ -72,18 +83,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:%=--%))))
 
@@ -95,22 +105,14 @@ OUTIN_FILES = $(addprefix $(outdir)/, $(IN_FILES:%.in=%))
 
 ALL_SOURCES = $(SOURCE_FILES)
 
-# Check if we are building for Cygwin
-#
-HOST_ARCH=$(shell $(CC) -dumpmachine)
-ifeq ($(HOST_ARCH),i686-pc-cygwin)
-CYGWIN_BUILD = yes
-endif
-ifeq ($(HOST_ARCH),i686-cygwin)
+ifeq (cygwin,$(findstring cygwin,$(HOST_ARCH)))
 CYGWIN_BUILD = yes
 endif
 
-ifeq ($(HOST_ARCH),i586-mingw32msvc)
+ifeq (mingw,$(findstring mingw,$(HOST_ARCH)))
 MINGW_BUILD = yes
 endif
-ifeq ($(HOST_ARCH),i386-mingw32)
-MINGW_BUILD = yes
-endif
-ifeq ($(HOST_ARCH),ppc-darwin)
+
+ifeq (darwin,$(findstring darwin,$(HOST_ARCH)))
 DARWIN_BUILD = yes
 endif