Partially fix "make framework-pkg"

We still need to sort out the "install-docs" story to get this working
properly.

diff --git a/Makefile b/Makefile
index bca8e86..d4303b6 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -32,8 +32,16 @@ else
 default : all
        @:
 
 default : all
        @:
 

+include mk/config.mk
+
+ifeq "$(ProjectVersion)" ""
+$(error Please run ./configure first)
+endif
+
+include mk/custom-settings.mk
+

 # No need to update makefiles for these targets:
 # No need to update makefiles for these targets:

-REALGOALS=$(filter-out clean clean_% distclean maintainer-clean show,$(MAKECMDGOALS))
+REALGOALS=$(filter-out framework-pkg clean clean_% distclean maintainer-clean show,$(MAKECMDGOALS))

 
 # NB. not the same as saying '%: ...', which doesn't do the right thing:
 # it does nothing if we specify a target that already exists.
 
 # NB. not the same as saying '%: ...', which doesn't do the right thing:
 # it does nothing if we specify a target that already exists.

@@ -65,6 +73,11 @@ $(filter clean_%, $(MAKECMDGOALS)) : clean_% :
 show:
        $(MAKE) -r --no-print-directory -f ghc.mk $@
 
 show:
        $(MAKE) -r --no-print-directory -f ghc.mk $@
 

+ifeq "$(darwin_TARGET_OS)" "1"
+framework-pkg:
+       $(MAKE) -C distrib/MacOS $@
+endif
+

 # If the user says 'make A B', then we don't want to invoke two
 # instances of the rule above in parallel:
 .NOTPARALLEL:
 # If the user says 'make A B', then we don't want to invoke two
 # instances of the rule above in parallel:
 .NOTPARALLEL:

diff --git a/distrib/MacOS/Makefile b/distrib/MacOS/Makefile
index d17e384..3d7852e 100644 (file)
--- a/distrib/MacOS/Makefile
+++ b/distrib/MacOS/Makefile
@@ -20,8 +20,13 @@
 #
 ############################################################################
 
 #
 ############################################################################
 

-TOP=../..
-include $(TOP)/mk/boilerplate.mk
+include ../../mk/config.mk
+
+ifeq "$(ProjectVersion)" ""
+$(error Please run ./configure first)
+endif
+
+include ../../mk/custom-settings.mk

 
 # The ProjectVersionInt is GHC's idea of an API version and hence determines
 # the framework version.
 
 # The ProjectVersionInt is GHC's idea of an API version and hence determines
 # the framework version.