X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile;h=1c0a6f0ce184bf5ac1dacf125c9970f37745399c;hb=63320e403b8260e71a39cfba34ac95fa71175207;hp=1a6c7f5de3eb425bd1f8c6ca7f6504b94cf0bd68;hpb=f8b78fd2506328885be10cf7736a74b5233e3230;p=ghc-hetmet.git

diff --git a/Makefile b/Makefile
index 1a6c7f5..1c0a6f0 100644
--- a/Makefile
+++ b/Makefile
@@ -9,26 +9,24 @@
 TOP=.
 include $(TOP)/mk/boilerplate.mk
 
-#
-# Totally evil hack to make the setting of SUBDIRS be dependent
-# on whether we do `make install' or not. Having a $(ifeq ... ) would
-# be preferable..
-CURRENT_TARGET = $(MAKECMDGOALS)
-
 # 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)" ""
    include $(shell echo $(Project) | tr A-Z a-z)/mk/config.mk
 endif
 
+# -----------------------------------------------------------------------------
+# Certain targets require that Project is set from the command line.
+
+CURRENT_TARGET = $(MAKECMDGOALS)
 project-check :
 	@if [ "$(Project)" = "" ]; then \
 		echo "	You need to set \"Project\" in order to make $(CURRENT_TARGET)"; \
@@ -37,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: 
@@ -152,11 +140,19 @@ binary-dist::
 	echo "PACKAGE_PRL_SCRIPTS = $($(Project)BinDistPrlScripts)" >> $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/Makefile.in
 	echo "PACKAGE_LIB_PRL_SCRIPTS = $($(Project)BinDistLibPrlScripts)" >> $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/Makefile.in
 	echo "PACKAGE_BINS = $($(Project)BinDistBins)" >> $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/Makefile.in
+	echo "PACKAGE_LINKS = $($(Project)BinDistLinks)" >> $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/Makefile.in
 	cat $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/Makefile-bin.in >> $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/Makefile.in
 	@echo "Generating a shippable configure script.."
 	$(MV) $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/configure-bin.in $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/configure.in 
 	( cd $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME); autoconf )
-
+	if test -x $(BIN_DIST_MAIN_DIR)/mk/post-install-script ; then \
+		cp $(BIN_DIST_MAIN_DIR)/mk/post-install-script \
+			$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME) ; \
+	fi
+	if test -x $(BIN_DIST_MAIN_DIR)/mk/post-inplace-script ; then \
+		cp $(BIN_DIST_MAIN_DIR)/mk/post-inplace-script \
+			$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME) ; \
+	fi
 #
 # binary dist'ing the documentation.  
 # Which documentation to build/install is hardcoded below.
@@ -252,10 +248,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 \
+	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
 
@@ -275,7 +272,7 @@ dist ::
 # Automatic generation of a MANIFEST file for a source distribution
 # tree that is ready to go.
 dist-manifest ::
-	cd $(SRC_DIST_DIR); $(FIND) . \( -type l -o -type f \) -exec ls -lLG {} \; | sed -e 's/\.\///' > /tmp/MANIFEST ; mv /tmp/MANIFEST MANIFEST
+	cd $(SRC_DIST_DIR); $(FIND) . \( -type l -o -type f \) -exec ls -lLG {} \; | sed -e 's/\.\///' > MANIFEST.tmp ; mv MANIFEST.tmp MANIFEST
 
 dist-package :: dist-package-tar-gz
 
@@ -296,7 +293,7 @@ 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; \
@@ -309,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; \