[project @ 2004-02-12 14:31:11 by simonpj]

[ghc-hetmet.git] / Makefile

diff --git a/Makefile b/Makefile
index 44ac9ac..b650d06 100644 (file)
--- 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,6 +48,9 @@ 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.
@@ -119,6 +122,7 @@ install ::
        done
 
 install-docs ::
+ifneq "$(SGMLDocWays)" ""
        @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), $(SUBDIRS)); do \
           if [ -d $$i ]; then \
@@ -126,6 +130,7 @@ install-docs ::
              if [ $$? -eq 0 -o $$x_on_err -eq 0 ] ;  then true; else exit 1; fi; \
              fi; \
        done
+endif
 
 # -----------------------------------------------------------------------------
 # Making a binary distribution
@@ -191,7 +196,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
@@ -254,9 +259,11 @@ binary-dist::
 # Which documentation to build/install is hardcoded below.
 #
 
+ifneq "$(SGMLDocWays)" ""
 BINDIST_DOC_WAYS = html ps
-# BINDIST_DOC_WAYS =
-
+else
+BINDIST_DOC_WAYS =
+endif
 binary-dist ::
        @for i in $(BIN_DIST_DIRS); do                          \
          if test -d "$$i"; then                                \
@@ -350,7 +357,7 @@ SRC_DIST_DIR=$(shell pwd)/$(SRC_DIST_NAME)
 SRC_DIST_DIRS += docs distrib $(SUBDIRS)
 SRC_DIST_FILES += \
        configure.ac config.guess config.sub configure \
-       aclocal.m4 acconfig.h README Makefile Makefile.config install-sh \
+       aclocal.m4 README Makefile Makefile.config install-sh \
        mk/bootstrap.mk \
        mk/boilerplate.mk mk/config.h.in mk/config.mk.in mk/opts.mk \
        mk/paths.mk mk/package.mk mk/suffix.mk mk/target.mk