summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorSimon Marlow <simonmar@microsoft.com>2007-05-18 08:51:28 +0000
committerSimon Marlow <simonmar@microsoft.com>2007-05-18 08:51:28 +0000
commit20b77872fe0dcca641094382f41f6b5eead2a68e (patch)
treeb79ad55f67e5d1fe55b3774e863e158339beb7fd /Makefile
parent03da11825e56e66c6b02bbf7f8e86c758776f942 (diff)
downloadhaskell-20b77872fe0dcca641094382f41f6b5eead2a68e.tar.gz
autodetect BINDIST_DOC_WAYS again
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile38
1 files changed, 22 insertions, 16 deletions
diff --git a/Makefile b/Makefile
index c27d5ac5f7..bedad7f39e 100644
--- a/Makefile
+++ b/Makefile
@@ -295,26 +295,32 @@ binary-dist::
# binary dist'ing the documentation.
# The default documentation to build/install is given below; overrideable
# via build.mk or the 'make' command-line.
+#
+# If BINDIST_DOC_WAYS is set, use that
+# If XMLDocWays is set, use that
+# Otherwise, figure out what we can build based on configure results
ifndef BINDIST_DOC_WAYS
+ifneq "$(XMLDocWays)" ""
BINDIST_DOC_WAYS = $(XMLDocWays)
-
-# ifneq "$(XSLTPROC)" ""
-# BINDIST_DOC_WAYS = html
-# ifneq "$(FOP)" ""
-# BINDIST_DOC_WAYS += ps pdf
-# else
-# ifneq "$(PDFXMLTEX)" ""
-# BINDIST_DOC_WAYS += pdf
-# endif
-# ifneq "$(XMLTEX)" ""
-# ifneq "$(DVIPS)" ""
-# BINDIST_DOC_WAYS += ps
-# endif # DVIPS
-# endif # XMLTEX
-# endif # FOP
-# endif # XSLTPROC
+else
+ifneq "$(XSLTPROC)" ""
+BINDIST_DOC_WAYS = html
+ifneq "$(FOP)" ""
+BINDIST_DOC_WAYS += ps pdf
+else
+ifneq "$(PDFXMLTEX)" ""
+BINDIST_DOC_WAYS += pdf
+endif
+ifneq "$(XMLTEX)" ""
+ifneq "$(DVIPS)" ""
+BINDIST_DOC_WAYS += ps
+endif # DVIPS
+endif # XMLTEX
+endif # FOP
+endif # XSLTPROC
+endif # XMLDocWays
endif # BINDIST_DOC_WAYS