Now that we have an "html" package, put the Haddock docs somewhere else

diff --git a/libraries/Makefile b/libraries/Makefile
index 0769216..5a9067f 100644 (file)
--- a/libraries/Makefile
+++ b/libraries/Makefile
@@ -55,7 +55,7 @@ include $(TOP)/mk/target.mk
 
 ifneq "$(NO_HADDOCK_DOCS)" "YES"
 
-HTML_DIR = html
+HTML_DIR = html-docs
 
 # ATTENTION, incomprehensible shell stuff ahead: Automagically create the
 # prologue for the combined index via a header, the package prologues (in

diff --git a/mk/package.mk b/mk/package.mk
index 85a07aa..1cd090a 100644 (file)
--- a/mk/package.mk
+++ b/mk/package.mk
@@ -356,7 +356,7 @@ ifneq "$(NO_HADDOCK_DOCS)" "YES"
 
 HS_PPS = $(addsuffix .raw-hs, $(basename $(filter-out $(EXCLUDED_HADDOCK_SRCS), $(HS_SRCS)))) $(EXTRA_HADDOCK_SRCS)
 
-HTML_DIR = ../html/$(PACKAGE)
+HTML_DIR = ../html-docs/$(PACKAGE)
 HTML_DOC = $(HTML_DIR)/haddock.css $(HTML_DIR)/haddock.js
 
 ifneq "$(HS_PPS)" ""