X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile;h=b6b23572cd39786d5aed9ad195b51b61e6c35fe3;hb=4dbe054c1bad98a333fcab2456ae0c8de6e82188;hp=b650d069dcce55ddf560bd3e131d948b43fd6dd0;hpb=ea79fe9020185332b7c79134f7bdb0f1bc5f1857;p=ghc-hetmet.git

diff --git a/Makefile b/Makefile
index b650d06..b6b2357 100644
--- 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 \
@@ -122,7 +122,6 @@ 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 \
@@ -130,7 +129,6 @@ ifneq "$(SGMLDocWays)" ""
 	      if [ $$? -eq 0 -o $$x_on_err -eq 0 ] ;  then true; else exit 1; fi; \
 	      fi; \
 	done
-endif
 
 # -----------------------------------------------------------------------------
 # Making a binary distribution
@@ -259,12 +257,11 @@ binary-dist::
 # Which documentation to build/install is hardcoded below.
 #
 
-ifneq "$(SGMLDocWays)" ""
 BINDIST_DOC_WAYS = html ps
-else
-BINDIST_DOC_WAYS =
-endif
+# 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); 	\
@@ -284,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...