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

diff --git a/Makefile b/Makefile
index 439aee6..7036d7c 100644
--- a/Makefile
+++ b/Makefile
@@ -9,17 +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)
-SUBDIRS = $(shell if (test x$(CURRENT_TARGET) = xinstall) ; then echo $(ProjectsToInstall); else echo $(ProjectsToBuild); fi)
+# find the projects that actually exist...
+SUBDIRS = $(filter $(patsubst %/, %, $(wildcard */)), $(AllProjects))
+
+# and filter only those that the user requested, if necessary
+ifeq "$(ProjectsToBuild)" ""
+Projects = $(SUBDIRS)
+else
+Projects = $(filter $(ProjectsToBuild), $(SUBDIRS))
+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)"; \
@@ -30,7 +37,7 @@ project-check :
 # -----------------------------------------------------------------------------
 # Make sure configure is up-to-date
 
-all boot :: configure
+all install dist binary-dist :: configure
 configure :: configure.in
 	@echo "WARNING: configure needs to be regenerated.  Type"
 	@echo "      make -f Makefile.config ./configure"
@@ -143,11 +150,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.
@@ -227,8 +242,11 @@ binary-dist::
 #
 # Do it like this: 
 #
-#	$ make boot
+#	$ make
 #	$ make dist Project=Ghc
+#
+# WARNING: `make dist' calls `make distclean' before tarring up the tree.
+#
 
 .PHONY: dist
 
@@ -240,7 +258,7 @@ SRC_DIST_DIR=$(shell pwd)/$(SRC_DIST_NAME)
 #
 # Files to include in source distributions
 #
-SRC_DIST_DIRS += docs distrib $(ProjectsToBuild)
+SRC_DIST_DIRS += docs distrib $(Projects)
 SRC_DIST_FILES += \
 	configure.in config.guess config.sub configure \
 	aclocal.m4 acconfig.h README Makefile install-sh \
@@ -263,7 +281,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
 
@@ -282,12 +300,6 @@ DIST_CLEAN_FILES += config.cache config.status
 
 MAINTAINER_CLEAN_FILES += configure
 
-ifeq "$(ProjectsToBuild)" ""
-Projects = $(AllProjects)
-else
-Projects = $(filter $(ProjectsToBuild), $(AllProjects))
-endif
-
 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 \
@@ -303,9 +315,9 @@ 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), $(AllProjects)); do \
+	for i in $(filter-out $(ProjectsDontInstall), $(Projects)); do \
 	   if [ -d $$i ]; then \
-	      $(MAKE) -C $$i boot all; \
+	      $(MAKE) -C $$i install; \
 	      if [ $$? -eq 0 -o $$x_on_err -eq 0 ] ;  then true; else exit 1; fi; \
 	      fi; \
 	done