X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile;h=92c4b13485b0515385a358928ee06f492204b75c;hb=49a478ab8bc97e2cbe6958a31cc6f3235c667d09;hp=076c4317fd90b69cee2b2d204b447f2d18fc04ac;hpb=b3966b78ef32dc1505e7b7f5a0fe2813366cdf6e;p=ghc-hetmet.git

diff --git a/Makefile b/Makefile
index 076c431..92c4b13 100644
--- a/Makefile
+++ b/Makefile
@@ -20,7 +20,16 @@ SUBDIRS = $(filter $(ProjectsToBuild), $(ProjectsThatExist))
 endif
 
 ifneq "$(Project)" ""
-   include $(shell echo $(Project) | tr A-Z a-z)/mk/config.mk
+   ifeq "$(Project)" "GreenCard"
+       ProjectDirectory=green-card
+   else
+	ifeq "$(Project)" "HaskellDirect"
+		ProjectDirectory=hdirect
+	else
+		ProjectDirectory=$(Project)
+	endif
+   endif
+   include $(shell echo $(ProjectDirectory) | tr A-Z a-z)/mk/config.mk
 endif
 
 # -----------------------------------------------------------------------------
@@ -102,6 +111,7 @@ ifeq "$(BIN_DIST)" ""
 endif
 	-rm -rf $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)
 	-$(RM) $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME).tar.gz
+	-echo "BIN_DIST_DIRS = $(BIN_DIST_DIRS)"
 	@for i in $(BIN_DIST_DIRS); do 		 	 \
 	  if test -d "$$i"; then 			 \
 	   echo $(MKDIRHIER) $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/bin/$(TARGETPLATFORM); \
@@ -161,19 +171,20 @@ binary-dist::
 #
 
 BINDIST_DOC_WAYS = html ps
+# BINDIST_DOC_WAYS =
 
 binary-dist ::
 	@for i in $(BIN_DIST_DIRS); do 		 	 	\
 	  if test -d "$$i"; then 			 	\
 	    $(MAKE) -C $$i $(MFLAGS) $(BINDIST_DOC_WAYS); 	\
-	    echo $(MAKE) -C $$i $(MFLAGS) install-docs SGMLDocWays="html ps" \
+	    echo $(MAKE) -C $$i $(MFLAGS) install-docs SGMLDocWays="$(BINDIST_DOC_WAYS)" \
 		prefix=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME) 	\
 		exec_prefix=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME) \
 		bindir=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/bin/$(TARGETPLATFORM) \
 		libdir=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/lib/$(TARGETPLATFORM) \
 		libexecdir=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/lib/$(TARGETPLATFORM) \
 		datadir=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/share; \
-	    $(MAKE) -C $$i $(MFLAGS) install-docs SGMLDocWays="html ps" \
+	    $(MAKE) -C $$i $(MFLAGS) install-docs SGMLDocWays="$(BINDIST_DOC_WAYS)" \
 		prefix=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME) 	\
 		exec_prefix=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME) \
 		bindir=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/bin/$(TARGETPLATFORM) \
@@ -270,8 +281,8 @@ dist ::
 	-$(RM) $(SRC_DIST_NAME).tar.gz
 	mkdir $(SRC_DIST_DIR)
 	mkdir $(SRC_DIST_DIR)/mk
-	( cd $(FPTOOLS_TOP_ABS); $(FIND) $(SRC_DIST_DIRS) -type d \( -name CVS -prune -o -name SRC -prune -o -print \) | sed -e 's!.*!mkdir "$(SRC_DIST_DIR)/&"!' | sh )
-	( cd $(FPTOOLS_TOP_ABS); $(FIND) $(SRC_DIST_DIRS) $(SRC_DIST_FILES) -name CVS -prune -o -name SRC -prune -o -name "*~" -prune -o -name ".cvsignore" -prune -o -name "\#*" -prune -o -name ".\#*" -prune -o -name "log" -prune -o -name "*-SAVE" -prune -o -name "*.orig" -prune -o -name "*.rej" -prune -o ! -type d -print | sed -e 's!.*!$(LN_S) "$(FPTOOLS_TOP_ABS)/&" "$(SRC_DIST_DIR)/&"!' | sh )
+	$(FIND) $(SRC_DIST_DIRS) -type d \( -name CVS -prune -o -name SRC -prune -o -print \) | sed -e 's!.*!mkdir "$(SRC_DIST_DIR)/&"!' | sh
+	$(FIND) $(SRC_DIST_DIRS) $(SRC_DIST_FILES) -name CVS -prune -o -name SRC -prune -o -name "*~" -prune -o -name ".cvsignore" -prune -o -name "\#*" -prune -o -name ".\#*" -prune -o -name "log" -prune -o -name "*-SAVE" -prune -o -name "*.orig" -prune -o -name "*.rej" -prune -o ! -type d -print | sed -e 's!.*!$(LN_S) "$(FPTOOLS_TOP_ABS)/&" "$(SRC_DIST_DIR)/&"!' | sh
 
 # Automatic generation of a MANIFEST file for a source distribution
 # tree that is ready to go.