[project @ 2004-02-12 02:11:33 by mthomas]

Support for nightly builds of utilities, esp. machines with no doc tools.

diff --git a/Makefile b/Makefile
index 4eb83e7..b650d06 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -122,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 \
@@ -129,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
@@ -257,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                                \

diff --git a/ghc/Makefile b/ghc/Makefile
index 6005c1e..dbc8017 100644 (file)
--- a/ghc/Makefile
+++ b/ghc/Makefile
@@ -1,5 +1,5 @@
 #-----------------------------------------------------------------------------
-# $Id: Makefile,v 1.23 2003/10/17 17:52:33 panne Exp $
+# $Id: Makefile,v 1.24 2004/02/12 02:11:34 mthomas Exp $
 #
 
 TOP=.
@@ -20,14 +20,24 @@ include $(TOP)/mk/boilerplate.mk
 # If we're booting from .hc files, swap the order
 # we descend into subdirs - to boot utils must be before driver.
 #
+
+# First - check whether we should build the docs directory.
+# On Windows, the tools to build docs are not always available.
+
+ifneq "$(SGMLDocWays)" ""
+DOCS_DIR = docs
+else
+DOCS_DIR =
+endif
+
 ifeq "$(BootingFromHc)" "YES"
-SUBDIRS = includes rts docs compiler utils driver
+SUBDIRS = includes rts $(DOCS_DIR) compiler utils driver
 else
 ifneq "$(ILXized)" "YES"
-SUBDIRS = includes utils driver docs compiler rts
+SUBDIRS = includes utils driver $(DOCS_DIR) compiler rts
 else
 # No RTS for ILX
-SUBDIRS = includes utils driver docs compiler
+SUBDIRS = includes utils driver $(DOCS_DIR) compiler
 endif
 endif
 

diff --git a/mk/target.mk b/mk/target.mk
index 911c21d..2c297b0 100644 (file)
--- a/mk/target.mk
+++ b/mk/target.mk
@@ -795,12 +795,14 @@ install:: $(INSTALL_INCLUDES)
 endif
 
 ifneq "$(INSTALL_DOCS)" ""
+ifneq "$(SGMLDocWays)" ""
 install-docs:: $(INSTALL_DOCS)
        @$(INSTALL_DIR) $(datadir)      
        for i in $(INSTALL_DOCS); do \
                $(INSTALL_DATA) $(INSTALL_OPTS) $$i $(datadir); \
        done
 endif
+endif
 
 ifneq "$(INSTALL_SGML_DOC)" ""
 ifneq "$(SGMLDocWays)" ""