X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile;h=a70a037edf83139267f6ce9135c512237e6f8435;hb=9956bafe44c39e07dff0c569dedc5cef3b41dbc7;hp=ee08e380e55775d75780785b57b17c02dc2413d3;hpb=0f35a78562ecc11ce89544e0b0fd8b027beb55cf;p=ghc-hetmet.git

diff --git a/Makefile b/Makefile
index ee08e38..a70a037 100644
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,10 @@
-#################################################################################
+############################################################################
 #
 #			fptools/Makefile
 #
 #		This is the main Makefile for fptools.
 #
-#################################################################################
+############################################################################
 
 TOP=.
 include $(TOP)/mk/boilerplate.mk
@@ -14,14 +14,18 @@ SRC_DIST_DIR=$(shell pwd)/$(SRC_DIST_NAME)
 # 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 = $@
+CURRENT_TARGET = $(MAKECMDGOALS)
 SUBDIRS = $(shell if (test x$(CURRENT_TARGET) = xinstall) ; then echo $(ProjectsToInstall); else echo $(ProjectsToBuild); fi)
 
+ifneq "$(Project)" ""
+   include $(shell echo $(Project) | tr A-Z a-z)/mk/config.mk
+endif
+
 #
 # Files to include in fptools source distribution
 #
 SRC_DIST_DIRS += mk docs CONTRIB distrib $(ProjectsToBuild)
-SRC_DIST_FILES += configure.in config.guess config.sub configure aclocal.m4 README INSTALL Makefile install-sh
+SRC_DIST_FILES += configure.in config.guess config.sub configure aclocal.m4 acconfig.h README INSTALL Makefile install-sh
 
 #
 # Making a binary distribution
@@ -47,6 +51,7 @@ BIN_DIST_TOP= distrib/Makefile-bin.in \
 	      $(BIN_DIST_MAIN_DIR)/ANNOUNCE \
 	      $(BIN_DIST_MAIN_DIR)/PATCHLEVEL \
 	      $(BIN_DIST_MAIN_DIR)/RELEASE \
+	      $(BIN_DIST_MAIN_DIR)/LICENSE \
 	      glafp-utils/mkdirhier/mkdirhier \
 	      install-sh \
 	      config.guess \
@@ -55,7 +60,7 @@ BIN_DIST_TOP= distrib/Makefile-bin.in \
 
 binary-dist::
 	@for i in $(BIN_DIST_TOP); do \
-	  if [ -e $$i ]; then \
+	  if test -f "$$i"; then \
 	     echo cp $$i $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME); \
 	     cp $$i $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME); \
 	  fi; \
@@ -96,19 +101,29 @@ binary-dist ::
 # Rename scripts to $i.prl and $i.sh where necessary.
 # ToDo: do this in a cleaner way...
 
+ifneq "$($(Project)BinDistPrlScripts)" ""
 binary-dist::
 	@for i in $($(Project)BinDistPrlScripts); do \
 	     echo "Renaming $$i to $$i.prl"; \
 	    $(MV) $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/bin/$(TARGETPLATFORM)/$(ProjectNameShort)-$(ProjectVersion)/$$i  $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/bin/$(TARGETPLATFORM)/$(ProjectNameShort)-$(ProjectVersion)/$$i.prl; \
 	done
+endif
+
+ifneq "$($(Project)BinDistLibPrlScripts)" ""
+binary-dist::
 	@for i in $($(Project)BinDistLibPrlScripts); do \
 	     echo "Renaming $$i to $$i.prl"; \
 	    $(MV) $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/lib/$(TARGETPLATFORM)/$(ProjectNameShort)-$(ProjectVersion)/$$i  $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/lib/$(TARGETPLATFORM)/$(ProjectNameShort)-$(ProjectVersion)/$$i.prl; \
 	done
+endif
+
+ifneq "$($(Project)BinDistShScripts)" ""
+binary-dist::
 	@for i in $($(Project)BinDistShScripts); do \
 	     echo "Renaming $$i to $$i.sh"; \
 	    $(MV) $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/bin/$(TARGETPLATFORM)/$(ProjectNameShort)-$(ProjectVersion)/$$i  $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/bin/$(TARGETPLATFORM)/$(ProjectNameShort)-$(ProjectVersion)/$$i.sh; \
 	done
+endif
 
 dist :: dist-pre
 include $(TOP)/mk/target.mk