Commit e946a8b1 authored by Ian Lynagh's avatar Ian Lynagh

Don't use absolute paths unnecessarily when making bindists

parent 845e0b2b
...@@ -167,7 +167,7 @@ ...@@ -167,7 +167,7 @@
); );
runOnlyForDeploymentPostprocessing = 0; runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh; 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 */ /* End PBXShellScriptBuildPhase section */
......
...@@ -361,8 +361,7 @@ ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32" ...@@ -361,8 +361,7 @@ ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
DEFAULT_TMPDIR = /C/TEMP DEFAULT_TMPDIR = /C/TEMP
endif endif
BIN_DIST_TOPDIR_ABS=$(TOP) BIN_DIST_DIR=bindistprep/$(BIN_DIST_NAME)
BIN_DIST_DIR=$(BIN_DIST_TOPDIR_ABS)/bindistprep/$(BIN_DIST_NAME)
BIN_DIST_NAME=ghc-$(ProjectVersion) BIN_DIST_NAME=ghc-$(ProjectVersion)
BIN_DIST_TAR=$(TOP)/bindistprep/$(BIN_DIST_NAME)-$(TARGETPLATFORM).tar BIN_DIST_TAR=$(TOP)/bindistprep/$(BIN_DIST_NAME)-$(TARGETPLATFORM).tar
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment