X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile;h=b89257fe3804d37dc0fbb8b21259a616cc5406fa;hb=37a24c9da4052c0a06f5bad4848ddbf43c486a15;hp=6643151861322e4cbc1a162297cca2f10f3f0a59;hpb=fe784e7dfffa8b876ed738306a82bf4bdcfd8be7;p=ghc-hetmet.git

diff --git a/Makefile b/Makefile
index 6643151..b89257f 100644
--- a/Makefile
+++ b/Makefile
@@ -37,6 +37,14 @@
 #	binary-dist
 #		Builds a binary distribution
 #
+#	framework-pkg  [MacOS only]
+#		Builds /Library/Frameworks/GHC.framework wrapped into a Mac
+#		installer package
+#
+#	framework-binary-dist  [MacOS only]
+#		Builds GHC.framework encapsulating a binary distribution
+#		(to give a relocatable framework)
+#
 #	hc-file-bundle
 #		Builds an HC-file bundle, for bootstrapping
 #
@@ -249,7 +257,7 @@ install-docs ::
 
 binary-dist::
 	-rm -rf $(BIN_DIST_DIR)
-	-$(RM) $(BIN_DIST_DIR).tar.gz
+	-$(RM) $(BIN_DIST_TARBALL)
 
 # When making bindists, we can have problems if some things (e.g. ghc-pkg)
 # are compiled with the bootstrapping compiler and some (e.g. the stage 2
@@ -299,7 +307,7 @@ ifeq "$(darwin_TARGET_OS)" "1"
 BIN_DIST_TOP+=mk/fix_install_names.sh
 endif
 
-.PHONY: binary-dist-pre% binary-dist binary-pack
+.PHONY: binary-dist-pre% binary-dist
 
 binary-dist:: binary-dist-pre
 
@@ -365,7 +373,7 @@ binary-dist :: tar-binary-dist
 .PHONY: tar-binary-dist
 tar-binary-dist:
 	( cd $(BIN_DIST_TOPDIR_ABS); tar cf - $(BIN_DIST_NAME) | bzip2 >$(BIN_DIST_TARBALL) )
-	( cd $(BIN_DIST_TOPDIR_ABS); bunzip2 -c $(BIN_DIST_TARBALL) | tar tf - | sed "s/^ghc-$(ProjectVersion)/fptools/" | sort >bin-manifest-$(ProjectVersion) )
+	( cd $(BIN_DIST_TOPDIR_ABS); bunzip2 -c $(BIN_DIST_TARBALL) | tar tf - | sed "s/^ghc-$(ProjectVersion)/fptools/" | sort >$(FPTOOLS_TOP_ABS)/bin-manifest-$(ProjectVersion) )
 
 PUBLISH_FILES = $(BIN_DIST_TARBALL)
 
@@ -418,6 +426,29 @@ binary-dist::
 	@echo "Mechanical and super-natty! Inspect the result and *if* happy; freeze, sell and get some sleep!"
 
 # -----------------------------------------------------------------------------
+# Building MacOS installer packages
+#
+# 'framework-pkg'
+#	Create an installer package for /Library/Frameworks/GHC.framework
+#
+# 'framework-binary-dist'
+#	Create an installer package for GHC.framework encapsulating a
+#	binary-dist to make it relocatable
+#	FIXME: This is only partially implemented so far
+
+ifeq "$(darwin_TARGET_OS)" "1"
+
+.PHONY: framework-pkg, framework-binary-dist
+
+framework-pkg:
+	$(MAKE) -C distrib/MacOS framework-pkg
+
+framework-binary-dist:
+	$(MAKE) -C distrib/MacOS framework-binary-dist
+
+endif
+
+# -----------------------------------------------------------------------------
 # Building source distributions
 #
 # Do it like this: