X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile;h=e86ec5a992230094736c7ff1363f9c9ff5c38dbc;hb=d95828709dd5e7e1d7e2e1eab8ef34a3a65e7d2f;hp=e71fe189adb84819d602ba96ff8ac0c67ccd641f;hpb=0d43cb1bcb0463f3a84d47e2bea66970cf9f8bca;p=ghc-hetmet.git

diff --git a/Makefile b/Makefile
index e71fe18..e86ec5a 100644
--- a/Makefile
+++ b/Makefile
@@ -74,7 +74,7 @@ endif
 
 SUBDIRS = gmp libffi includes utils docs rts compiler ghc driver libraries libraries/Cabal/doc
 
-check-all: check-packages
+check-all: check-packages check-tools
 
 # Sanity check that all the boot libraries are in the tree, to catch
 # failure to run darcs-all.
@@ -93,6 +93,21 @@ check-packages :
 	    exit 1; \
 	fi
 
+HAVE_EVAL := NO
+$(eval HAVE_EVAL := YES)
+
+check-tools:
+ifeq "$(HSCOLOUR_SRCS) $(HSCOLOUR)" "YES "
+	@echo "HsColour needed but wasn't found."
+	@echo "Set HSCOLOUR_SRCS=NO if you don't want to use it"
+	exit 1
+endif
+ifeq "$(HAVE_EVAL)" "NO"
+	@echo "Your make doesn't support eval. You need GNU make >= 3.80"
+	exit 1
+endif
+	@:
+
 ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
 ifneq "$(WhatGccIsCalled)" ""
 GCC_LIB_DEP = stamp.inplace-gcc-lib
@@ -102,7 +117,6 @@ endif
 stage1 : $(GCC_LIB_DEP) check-all
 	$(MAKE) -C libraries boot
 	$(MAKE) -C gmp       all
-	$(MAKE) -C libffi    all
 	$(MAKE) -C utils/mkdependC boot
 	$(MAKE) -C utils with-bootstrapping-compiler
 	@case '${MFLAGS}' in *-[ik]*) x_on_err=0;; *-r*[ik]*) x_on_err=0;; *) x_on_err=1;; esac; \
@@ -122,6 +136,7 @@ stage1 : $(GCC_LIB_DEP) check-all
 	  $(MAKE) --no-print-directory -C $$i $(MFLAGS) all; \
 	  if [ $$? -eq 0 -o $$x_on_err -eq 0 ] ;  then true; else exit 1; fi; \
 	done
+	$(MAKE) -C libffi    all
 	$(MAKE) -C rts boot
 	$(MAKE) -C rts
 	$(MAKE) -C libraries all
@@ -194,6 +209,8 @@ install-strip:
 
 # Same as default rule, but we pass $(INSTALL_STAGE) to $(MAKE) too
 install :: check-packages
+	$(MKDIRHIER) $(DESTDIR)$(datadir)
+	echo "[]" > $(DESTDIR)$(datadir)/package.conf
 	@case '${MFLAGS}' in *-[ik]*) x_on_err=0;; *-r*[ik]*) x_on_err=0;; *) x_on_err=1;; esac; \
 	for i in $(SUBDIRS); do \
 	  echo "------------------------------------------------------------------------"; \
@@ -573,11 +590,11 @@ ifneq "$(PublishLocation)" ""
 dist ::
 	@for i in 0 1 2 3 4 5 6 7 8 9; do \
 		echo "Try $$i: $(PublishCp) $(SRC_DIST_EXTRALIBS_TARBALL) $(PublishLocation)/dist"; \
-		if $(PublishCp) $(SRC_DIST_EXTRALIBS_TARBALL) $(PublishLocation)/dist; then break; fi\
+		if $(PublishCp) $(SRC_DIST_EXTRALIBS_TARBALL) $(PublishLocation)/dist; then break; fi; \
 	done
 	@for i in 0 1 2 3 4 5 6 7 8 9; do \
 		echo "Try $$i: $(PublishCp) $(SRC_DIST_TARBALL) $(PublishLocation)/dist"; \
-		if $(PublishCp) $(SRC_DIST_TARBALL) $(PublishLocation)/dist; then break; fi\
+		if $(PublishCp) $(SRC_DIST_TARBALL) $(PublishLocation)/dist; then break; fi; \
 	done
 endif