[commit: ghc] master: Build system: add mk/validate.mk.sample (a3c78ab)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/a3c78abcbdfe5025dc704acdcd0a85c78cabbd6b/ghc

>---------------------------------------------------------------

commit a3c78abcbdfe5025dc704acdcd0a85c78cabbd6b
Author: Thomas Miedema <thomasmiedema at gmail.com>
Date:   Sat Oct 3 19:02:37 2015 +0200

    Build system: add mk/validate.mk.sample
    
    Reviewers: austin, bgamari
    
    Subscribers: erikd
    
    Differential Revision: https://phabricator.haskell.org/D1303
    
    	modified:   configure.ac


>---------------------------------------------------------------

a3c78abcbdfe5025dc704acdcd0a85c78cabbd6b
 configure.ac          | 4 ++--
 ghc.mk                | 3 ++-
 mk/validate.mk.sample | 4 ++++
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index d890a6f..c9a6ed0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1197,8 +1197,8 @@ echo ["\
 fi
 
 echo ["\
-   Building Sphinx HTML documentation : $BUILD_SPHINX_HTML
-   Building Sphinx PDF documentation  : $BUILD_SPHINX_PDF"]
+   Tools to build Sphinx HTML documentation available: $BUILD_SPHINX_HTML
+   Tools to build Sphinx PDF documentation available: $BUILD_SPHINX_PDF"]
 
 echo ["----------------------------------------------------------------------
 "]
diff --git a/ghc.mk b/ghc.mk
index a76e7fc..9660215 100644
--- a/ghc.mk
+++ b/ghc.mk
@@ -171,7 +171,8 @@ endif
 ifeq "$(BUILD_SPHINX_HTML)" "YES"
 ifeq "$(SPHINXBUILD)" ""
 $(error BUILD_SPHINX_HTML=YES, but `sphinx-build` was not found. \
-  Install `sphinx-build`, then rerun `./configure`. \
+  Create a file `mk/validate.mk` containing `BUILD_SPHINX_HTML=NO` \
+  (when validating), or install `sphinx-build` and rerun `./configure`. \
   See https://ghc.haskell.org/trac/ghc/wiki/Building/Preparation)
 endif
 endif
diff --git a/mk/validate.mk.sample b/mk/validate.mk.sample
new file mode 100644
index 0000000..83c2c40
--- /dev/null
+++ b/mk/validate.mk.sample
@@ -0,0 +1,4 @@
+# These settings override mk/flavours/validate.mk (see
+# mk/custom-settings.mk).
+#HADDOCK_DOCS       = NO
+#BUILD_SPHINX_HTML  = NO