From e946a8b1020e9a0e75bba33c64739c93c65c1424 Mon Sep 17 00:00:00 2001 From: Ian Lynagh Date: Sun, 27 Sep 2009 19:35:28 +0000 Subject: [PATCH] Don't use absolute paths unnecessarily when making bindists --- distrib/MacOS/GHC.xcodeproj/project.pbxproj | 2 +- mk/config.mk.in | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/distrib/MacOS/GHC.xcodeproj/project.pbxproj b/distrib/MacOS/GHC.xcodeproj/project.pbxproj index fa5f095..7b37dbd 100644 --- a/distrib/MacOS/GHC.xcodeproj/project.pbxproj +++ b/distrib/MacOS/GHC.xcodeproj/project.pbxproj @@ -167,7 +167,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "if [ ${ACTION} = build ]; then\n make -C ../.. BIN_DIST_TOPDIR_ABS=${TARGET_BUILD_DIR}/${CONTENTS_FOLDER_PATH} BIN_DIST_NAME=ghc binary-dist\nfi\n"; + shellScript = "if [ ${ACTION} = build ]; then\n make -C ../.. BIN_DIST_NAME=ghc binary-dist\nfi\n"; }; /* End PBXShellScriptBuildPhase section */ diff --git a/mk/config.mk.in b/mk/config.mk.in index ee43943..32fb196 100644 --- a/mk/config.mk.in +++ b/mk/config.mk.in @@ -361,8 +361,7 @@ ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32" DEFAULT_TMPDIR = /C/TEMP endif -BIN_DIST_TOPDIR_ABS=$(TOP) -BIN_DIST_DIR=$(BIN_DIST_TOPDIR_ABS)/bindistprep/$(BIN_DIST_NAME) +BIN_DIST_DIR=bindistprep/$(BIN_DIST_NAME) BIN_DIST_NAME=ghc-$(ProjectVersion) BIN_DIST_TAR=$(TOP)/bindistprep/$(BIN_DIST_NAME)-$(TARGETPLATFORM).tar -- 1.7.10.4