X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=stepmake%2Fstepmake%2Fgeneric-vars.make;h=834a527409384fbc542e81f76f10f93254905297;hb=74611a3ca440ee749aadf238bab6edbbbbb4f6f8;hp=e3fe7c76a800e871651b1323108ab9ee6d7e5e9a;hpb=81bae20491746a661ba64f903f05b505b7ad5b95;p=lilypond.git

diff --git a/stepmake/stepmake/generic-vars.make b/stepmake/stepmake/generic-vars.make
index e3fe7c76a8..834a527409 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
@@ -26,7 +29,7 @@ endif
 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)
@@ -38,8 +41,10 @@ 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
@@ -76,14 +81,14 @@ DIST_FILES=$(EXTRA_DIST_FILES) GNUmakefile $(ALL_SOURCES) $(call src-wildcard,SC
 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 +100,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)
-MINGW_BUILD = yes
-endif
-ifeq ($(HOST_ARCH),i386-mingw32)
+ifeq (mingw,$(findstring mingw,$(HOST_ARCH)))
 MINGW_BUILD = yes
 endif
+
 ifeq (darwin,$(findstring darwin,$(HOST_ARCH)))
 DARWIN_BUILD = yes
 endif