Build system: add mk/validate.mk.sample
authorThomas Miedema <thomasmiedema@gmail.com>
Sat, 3 Oct 2015 17:02:37 +0000 (19:02 +0200)
committerBen Gamari <ben@smart-cactus.org>
Sat, 3 Oct 2015 17:02:37 +0000 (19:02 +0200)
Reviewers: austin, bgamari

Subscribers: erikd

Differential Revision: https://phabricator.haskell.org/D1303

modified:   configure.ac

configure.ac
ghc.mk
mk/validate.mk.sample [new file with mode: 0644]

index d890a6f..c9a6ed0 100644 (file)
@@ -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 (file)
--- 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 (file)
index 0000000..83c2c40
--- /dev/null
@@ -0,0 +1,4 @@
+# These settings override mk/flavours/validate.mk (see
+# mk/custom-settings.mk).
+#HADDOCK_DOCS       = NO
+#BUILD_SPHINX_HTML  = NO