X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile;h=d0f52b93a67f9f6f7be2efeb0fcb007b82a5d785;hb=ab7369b272b3ec6edc197a88f1d0056b82c3efa4;hp=d4303b639d83aea59393c572e77ada197e2f1e27;hpb=637e621af0214877c98cb3ca5ae4dca5f737c316;p=ghc-hetmet.git

diff --git a/Makefile b/Makefile
index d4303b6..d0f52b9 100644
--- a/Makefile
+++ b/Makefile
@@ -32,21 +32,30 @@ else
 default : all
 	@:
 
+ifneq "$(findstring clean,$(MAKECMDGOALS))" ""
+-include mk/config.mk
+else
 include mk/config.mk
-
 ifeq "$(ProjectVersion)" ""
 $(error Please run ./configure first)
 endif
+endif
 
 include mk/custom-settings.mk
 
+# If the package ghc.mk files are missing, generate them.  This means that
+# repeating 'make maintainer-clean' works.
+PACKAGE_MK=libraries/base/ghc.mk
+$(PACKAGE_MK):
+	sh boot-pkgs
+
 # No need to update makefiles for these targets:
 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.
 .PHONY: $(REALGOALS)
-$(REALGOALS) all:
+$(REALGOALS) all: $(PACKAGE_MK)
 	@echo "===--- updating makefiles phase 0"
 	$(MAKE) -r --no-print-directory -f ghc.mk phase=0 just-makefiles
 	@echo "===--- updating makefiles phase 1"
@@ -58,19 +67,19 @@ $(REALGOALS) all:
 	@echo "===--- finished updating makefiles"
 	$(MAKE) -r --no-print-directory -f ghc.mk $@
 
-binary-dist:
+binary-dist: $(PACKAGE_MK)
 	rm -f bindist-list
 	$(MAKE) -r --no-print-directory -f ghc.mk bindist BINDIST=YES
 	$(MAKE) -r --no-print-directory -f ghc.mk binary-dist
 
-clean distclean maintainer-clean:
+clean distclean maintainer-clean: $(PACKAGE_MK)
 	$(MAKE) -r --no-print-directory -f ghc.mk $@
 	test ! -d testsuite || $(MAKE) -C testsuite $@
 
-$(filter clean_%, $(MAKECMDGOALS)) : clean_% :
+$(filter clean_%, $(MAKECMDGOALS)) : clean_% : $(PACKAGE_MK)
 	$(MAKE) -r --no-print-directory -f ghc.mk $@
 
-show:
+show: $(PACKAGE_MK)
 	$(MAKE) -r --no-print-directory -f ghc.mk $@
 
 ifeq "$(darwin_TARGET_OS)" "1"
@@ -83,4 +92,3 @@ endif
 .NOTPARALLEL:
 
 endif
-