X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile;h=c96a0c13aee5a74c663bb65e9dbd2376168c19a4;hb=604dc199b6289171a7d5a258b18be5202595489b;hp=7036d7c0f871c9278b07b58182e3252a3fc9a701;hpb=0147f8cce1d6c972de066df2da627206bb8b2e8d;p=ghc-hetmet.git

diff --git a/Makefile b/Makefile
index 7036d7c..c96a0c1 100644
--- a/Makefile
+++ b/Makefile
@@ -10,13 +10,13 @@ TOP=.
 include $(TOP)/mk/boilerplate.mk
 
 # find the projects that actually exist...
-SUBDIRS = $(filter $(patsubst %/, %, $(wildcard */)), $(AllProjects))
+ProjectsThatExist = $(filter $(patsubst %/, %, $(wildcard */)), $(AllProjects))
 
 # and filter only those that the user requested, if necessary
 ifeq "$(ProjectsToBuild)" ""
-Projects = $(SUBDIRS)
+SUBDIRS = $(ProjectsThatExist)
 else
-Projects = $(filter $(ProjectsToBuild), $(SUBDIRS))
+SUBDIRS = $(filter $(ProjectsToBuild), $(ProjectsThatExist))
 endif
 
 ifneq "$(Project)" ""
@@ -35,16 +35,6 @@ project-check :
 	fi
 
 # -----------------------------------------------------------------------------
-# Make sure configure is up-to-date
-
-all install dist binary-dist :: configure
-configure :: configure.in
-	@echo "WARNING: configure needs to be regenerated.  Type"
-	@echo "      make -f Makefile.config ./configure"
-	@echo "and rerun make."
-	@exit 16
-
-# -----------------------------------------------------------------------------
 # Making a binary distribution
 #
 # To make a particular binary distribution: 
@@ -171,6 +161,7 @@ binary-dist::
 BINDIST_DOCS = $($(Project)BinDistDocs)
 BINDIST_DOCS_WAYS = html ps
 
+ifeq "$(HOSTPLATFORM)" "i386-unknown-linux"
 binary-dist ::
 	@for way in $(BINDIST_DOCS_WAYS); do \
 	   $(MKDIRHIER) $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/$$way; \
@@ -189,6 +180,7 @@ binary-dist ::
 	   done; \
 	done
 	@rm -f .doclog
+endif
 
 # Rename scripts to $i.prl and $i.sh where necessary.
 # ToDo: do this in a cleaner way...
@@ -258,10 +250,11 @@ SRC_DIST_DIR=$(shell pwd)/$(SRC_DIST_NAME)
 #
 # Files to include in source distributions
 #
-SRC_DIST_DIRS += docs distrib $(Projects)
+SRC_DIST_DIRS += docs distrib $(SUBDIRS)
 SRC_DIST_FILES += \
 	configure.in config.guess config.sub configure \
-	aclocal.m4 acconfig.h README Makefile install-sh \
+	aclocal.m4 acconfig.h README Makefile Makefile.config install-sh \
+	mk/bootstrap.mk \
 	mk/boilerplate.mk mk/config.h.in mk/config.mk.in mk/opts.mk \
 	mk/paths.mk mk/suffix.mk mk/target.mk
 
@@ -298,11 +291,9 @@ dist-package-zip ::
 
 DIST_CLEAN_FILES += config.cache config.status
 
-MAINTAINER_CLEAN_FILES += configure
-
 all ::
 	@case '${MFLAGS}' in *-[ik]*) x_on_err=0;; *-r*[ik]*) x_on_err=0;; *) x_on_err=1;; esac; \
-	for i in $(Projects); do \
+	for i in $(SUBDIRS); do \
 	   if [ -d $$i ]; then \
 	      $(MAKE) -C $$i boot all; \
 	      if [ $$? -eq 0 -o $$x_on_err -eq 0 ] ;  then true; else exit 1; fi; \
@@ -315,7 +306,7 @@ boot ::
 
 install ::
 	@case '${MFLAGS}' in *-[ik]*) x_on_err=0;; *-r*[ik]*) x_on_err=0;; *) x_on_err=1;; esac; \
-	for i in $(filter-out $(ProjectsDontInstall), $(Projects)); do \
+	for i in $(filter-out $(ProjectsDontInstall), $(SUBDIRS)); do \
 	   if [ -d $$i ]; then \
 	      $(MAKE) -C $$i install; \
 	      if [ $$? -eq 0 -o $$x_on_err -eq 0 ] ;  then true; else exit 1; fi; \