Don't use absolute paths unnecessarily when making bindists

diff --git a/distrib/MacOS/GHC.xcodeproj/project.pbxproj b/distrib/MacOS/GHC.xcodeproj/project.pbxproj
index fa5f095..7b37dbd 100644 (file)
--- 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 (file)
--- 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