Make comparison on equalities work right (ie look at the types)

[ghc-hetmet.git] / distrib / MacOS / Makefile

diff --git a/distrib/MacOS/Makefile b/distrib/MacOS/Makefile
index 312fbd7..35118f3 100644 (file)
--- a/distrib/MacOS/Makefile
+++ b/distrib/MacOS/Makefile
@@ -40,7 +40,7 @@ PACKAGE_NAME = GHC-$(ProjectVersion)-$(TargetArch_CPP).pkg
 
 # Determine arguments that should be passed to ./configure from within Xcode
 #
-# By default, we pass whatever was used whne the present tree was configured.
+# By default, we pass whatever was used when the present tree was configured.
 # The user can override this by setting XCODE_EXTRA_CONFIGURE_ARGS.  If
 # MACOSX_DEPLOYMENT_TARGET is set, the target is added to whatever arguments
 # are passed.
@@ -52,6 +52,13 @@ ifneq "$(MACOSX_DEPLOYMENT_TARGET)" ""
 XCODE_EXTRA_CONFIGURE_ARGS += --with-macosx-deployment-target=$(MACOSX_DEPLOYMENT_TARGET)
 endif
 
+# Determine whether we need to pass a "-target" option to packagemaker
+#
+# If a deployment target has been set, we use the same target for packagemaker.
+ifneq "$(MACOSX_DEPLOYMENT_TARGET)" ""
+PACKAGEMAKER_TARGET = -target $(MACOSX_DEPLOYMENT_TARGET)
+endif
+
 # Xcode's installation build product location (this is where the GHC.framework
 # is assembled)
 DSTROOT=/tmp/GHC.dst
@@ -75,13 +82,19 @@ framework-pkg:
        -$(RM) -rf $(DSTROOT)
        mkdir -p $(TOOLS_SYSTEM)
        cp installer-scripts/Uninstaller $(TOOLS_SYSTEM)
-       xcodebuild -target GHC-systemwide clean build install\
+       xcodebuild -target GHC-systemwide clean build\
+                  CURRENT_PROJECT_VERSION=$(CURRENT_PROJECT_VERSION)\
+                  SHORT_VERSION_STRING=$(SHORT_VERSION_STRING)\
+                  FRAMEWORK_VERSION=$(FRAMEWORK_VERSION)\
+                  CURRENT_LIBRARY_VERSION=$(FRAMEWORK_VERSION)
+       xcodebuild -target GHC-systemwide install\
                   CURRENT_PROJECT_VERSION=$(CURRENT_PROJECT_VERSION)\
                   SHORT_VERSION_STRING=$(SHORT_VERSION_STRING)\
                   FRAMEWORK_VERSION=$(FRAMEWORK_VERSION)\
                   CURRENT_LIBRARY_VERSION=$(FRAMEWORK_VERSION)
        -$(RM) -f GHC-system.pmdoc/*-contents.xml
-       $(PACKAGEMAKER) -v --doc GHC-system.pmdoc -o $(TOP)/$(PACKAGE_NAME)
+       $(PACKAGEMAKER) -v --doc GHC-system.pmdoc\
+                       $(PACKAGEMAKER_TARGET) -o $(TOP)/$(PACKAGE_NAME)
 
 # Instead of making 'binary-dist' a Makefile dependency, we let xcodebuild call
 # 'make binary-dist'.  This has the advantage that xcode knows the framework