X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile;h=b6b23572cd39786d5aed9ad195b51b61e6c35fe3;hb=ffe71d18b231aa0223f8ca9229760e6ebced367e;hp=794860b06865290a473801757933e4ad054fe288;hpb=6b4abadb6b860d53ed20d795cd2274bd7fc275f8;p=ghc-hetmet.git

diff --git a/Makefile b/Makefile
index 794860b..b6b2357 100644
--- a/Makefile
+++ b/Makefile
@@ -21,7 +21,7 @@ endif
 
 ifneq "$(Project)" ""
    ifeq "$(Project)" "GreenCard"
-       ProjectDirectory=green-card
+       ProjectDirectory=greencard
    else
 	ifeq "$(Project)" "HaskellDirect"
 		ProjectDirectory=hdirect
@@ -48,19 +48,22 @@ project-check :
 
 DIST_CLEAN_FILES += config.cache config.status
 
+extraclean::
+	$(RM) -rf autom4te.cache
+
 #
 # If you've ended up using an in-place version of Happy,
 # make sure it gets built early on.
 #
 ifeq "$(HAPPY)" "$(FPTOOLS_TOP_ABS)/happy/src/happy-inplace"
-build : $(FPTOOLS_TOP_ABS)/happy/src/happy-inplace
+build :: $(FPTOOLS_TOP_ABS)/happy/src/happy-inplace
 
 $(FPTOOLS_TOP_ABS)/happy/src/happy-inplace : glafp-utils
 	$(MAKE) -C happy boot all
 endif
 
 # Build all projects that we know about
-build :
+build ::
 	@case '${MFLAGS}' in *-[ik]*) x_on_err=0;; *-r*[ik]*) x_on_err=0;; *) x_on_err=1;; esac; \
 	for i in $(SUBDIRS); do \
 	   if [ -d $$i ]; then \
@@ -191,7 +194,7 @@ BIN_DIST_TMPDIR=$(FPTOOLS_TOP_ABS)
 
 binary-dist-pre::
 ifeq "$(BIN_DIST)" ""
-	echo "WARNING: To run the binary-dist target, you need to set BIN_DIST=1 in your build.mk" && exit 1
+	@echo "WARNING: To run the binary-dist target, you need to set BIN_DIST=1 in your build.mk" && exit 1
 endif
 	-rm -rf $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)
 	-$(RM) $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME).tar.gz
@@ -258,6 +261,7 @@ BINDIST_DOC_WAYS = html ps
 # BINDIST_DOC_WAYS =
 
 binary-dist ::
+ifneq "$(DOCBOOK_CATALOG)" ""
 	@for i in $(BIN_DIST_DIRS); do 		 	 	\
 	  if test -d "$$i"; then 			 	\
 	    $(MAKE) -C $$i $(MFLAGS) $(BINDIST_DOC_WAYS); 	\
@@ -277,6 +281,7 @@ binary-dist ::
 		datadir=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/share; \
 	  fi \
 	done
+endif
 
 # Rename scripts to $i.prl and $i.sh where necessary.
 # ToDo: do this in a cleaner way...