autodetect BINDIST_DOC_WAYS again

[ghc-hetmet.git] / Makefile

diff --git a/Makefile b/Makefile
index ff8adb7..bedad7f 100644 (file)
--- 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
 
@@ -396,8 +402,8 @@ endif
 .PHONY: publish-binary-dist
 publish-binary-dist :
        @for i in 0 1 2 3 4 5 6 7 8 9; do \
-               echo "Try $$i: $(PublishCp) $(BIN_DIST_TARBALL) $(PublishLocation)"; \
-               if $(PublishCp) $(BIN_DIST_TARBALL) $(PublishLocation); then break; fi\
+               echo "Try $$i: $(PublishCp) $(BIN_DIST_TARBALL) $(PublishLocation)/dist"; \
+               if $(PublishCp) $(BIN_DIST_TARBALL) $(PublishLocation)/dist; then break; fi; \
        done
        $(PublishCp) -r $(BIN_DIST_DIR)/share/html/* $(PublishLocation)/docs