[project @ 2004-03-16 05:05:31 by mthomas]

[ghc-hetmet.git] / Makefile

diff --git a/Makefile b/Makefile
index 7f47f3b..b6b2357 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -56,14 +56,14 @@ extraclean::
 # 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 \
@@ -194,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
@@ -261,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);       \
@@ -280,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...