X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile;h=cb75190245620e3d1559082eca85507965f38465;hb=cd09a67b48427a6d9f30a3d800e9f525dd353ca0;hp=0c93680467824a69a7a00cf24ad43adc3a1a6ddb;hpb=3f3e085e8a061ac11ec80a8c455fed952e3fdaec;p=ghc-hetmet.git

diff --git a/Makefile b/Makefile
index 0c93680..cb75190 100644
--- a/Makefile
+++ b/Makefile
@@ -9,12 +9,6 @@
 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))
 
@@ -29,6 +23,10 @@ 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)"; \
@@ -144,18 +142,19 @@ binary-dist::
 	     cp $$i $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME); \
 	  fi; \
 	done;
-#	@echo "Configuring the Makefile for this project..."
-#	touch $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/Makefile.in
-#	echo "package = $(ProjectNameShort)" >> $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/Makefile.in
-#	echo "version = $(ProjectVersion)" >> $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/Makefile.in
-#	echo "PACKAGE_SH_SCRIPTS = $($(Project)BinDistShScripts)" >> $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/Makefile.in
-#	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
-#	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 )
+	@echo "Configuring the Makefile for this project..."
+	touch $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/Makefile.in
+	echo "package = $(ProjectNameShort)" >> $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/Makefile.in
+	echo "version = $(ProjectVersion)" >> $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/Makefile.in
+	echo "PACKAGE_SH_SCRIPTS = $($(Project)BinDistShScripts)" >> $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/Makefile.in
+	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 )
 
 #
 # binary dist'ing the documentation.