X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=distrib%2FMacOS%2FGHC.xcodeproj%2Fproject.pbxproj;h=7b37dbde3140b96cd0da3787ad7436e516cdbc6d;hb=142df90ad9ec1155129a01949775bf992c75f08f;hp=3374bfac2c66383ef93f67e5e82293a2246eaded;hpb=5db43861247cb96adb8d138bfd8e408180c348f1;p=ghc-hetmet.git

diff --git a/distrib/MacOS/GHC.xcodeproj/project.pbxproj b/distrib/MacOS/GHC.xcodeproj/project.pbxproj
index 3374bfa..7b37dbd 100644
--- a/distrib/MacOS/GHC.xcodeproj/project.pbxproj
+++ b/distrib/MacOS/GHC.xcodeproj/project.pbxproj
@@ -152,7 +152,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "# We need to be at the top of the ghc tree\ncd ../..\n\nPREFIX=${INSTALL_PATH}/${CONTENTS_FOLDER_PATH}/usr\n\nif [ ${ACTION} = build ]; then\n  # put explicit --prefix last, in case the extra configure args contain a prefix\n  ./configure \"${XCODE_EXTRA_CONFIGURE_ARGS}\" --prefix=${PREFIX} || exit 1\n  MAKE_ACTION=\n  DOCS_ACTION=html\nelse\n  MAKE_ACTION=${ACTION}\n  DOCS_ACTION=install-docs\nfi\n\n# - Yes, it's the vanilla install target that must see HADDOCK_DOCS=YES, not the install-docs target.\n# - We must explictly force the creation of a symbol table in .a files on BSD, and not all versions of Cabal\n#   do that consistently; hence, the EXTRA_AR_ARGS.\nmake DESTDIR=${DSTROOT} HADDOCK_DOCS=YES EXTRA_AR_ARGS=-s ${MAKE_ACTION} || exit 1\nmake DESTDIR=${DSTROOT} XMLDocWays=html ${DOCS_ACTION} || exit 1";
+			shellScript = "# We need to be at the top of the ghc tree\ncd ../..\n\nPREFIX=${INSTALL_PATH}/${CONTENTS_FOLDER_PATH}/usr\n\nif [ ${ACTION} = build ]; then\n  # put explicit --prefix last, in case the extra configure args contain a prefix\n  ./configure ${XCODE_EXTRA_CONFIGURE_ARGS} --prefix=${PREFIX} || exit 1\n  MAKE_ACTION=\nelse\n  MAKE_ACTION=${ACTION}\nfi\n\n# - We must explictly force the creation of a symbol table in .a files on BSD, and not all versions of Cabal\n#   do that consistently; hence, the EXTRA_AR_ARGS.\nmake DESTDIR=${DSTROOT} HADDOCK_DOCS=YES EXTRA_AR_ARGS=-s ${MAKE_ACTION} < /dev/null || exit 1\nmake DESTDIR=${DSTROOT} || exit 1";
 		};
 		E76B00450D52DFDB00A05A2F /* ShellScript */ = {
 			isa = PBXShellScriptBuildPhase;
@@ -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 */