summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorIan Lynagh <igloo@earth.li>2009-05-08 22:48:57 +0000
committerIan Lynagh <igloo@earth.li>2009-05-08 22:48:57 +0000
commit637e621af0214877c98cb3ca5ae4dca5f737c316 (patch)
tree1c0c8edabb61a77dfdb4bc1a65ec4bcb7e8d33af /Makefile
parent1cce2f51656cfbd8c7933a914a4bd981792aa1e6 (diff)
downloadhaskell-637e621af0214877c98cb3ca5ae4dca5f737c316.tar.gz
Partially fix "make framework-pkg"
We still need to sort out the "install-docs" story to get this working properly.
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile15
1 files changed, 14 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index bca8e86432..d4303b639d 100644
--- a/Makefile
+++ b/Makefile
@@ -32,8 +32,16 @@ else
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:
-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.
@@ -65,6 +73,11 @@ $(filter clean_%, $(MAKECMDGOALS)) : clean_% :
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: