X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=stepmake%2Fstepmake%2Fgeneric-vars.make;h=834a527409384fbc542e81f76f10f93254905297;hb=690a06700b972b0688eabb0edcd7da92531757bb;hp=2d36dd8435a99c0753c54e728c00d53e4f7085d0;hpb=49cae4a7b28489a51e8c97dc33fc64cf83ea25e7;p=lilypond.git

diff --git a/stepmake/stepmake/generic-vars.make b/stepmake/stepmake/generic-vars.make
index 2d36dd8435..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)
@@ -42,7 +45,6 @@ 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
@@ -98,10 +100,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