Make the new build system install the documentation

diff --git a/ghc.mk b/ghc.mk
index 94a6adf..287db6d 100644 (file)
--- a/ghc.mk
+++ b/ghc.mk
@@ -679,7 +679,7 @@ libraries/ghc-prim/dist-install/build/autogen/GHC/PrimopWrappers.hs: \
 # Installation
 
 install: install_packages install_libs install_libexecs install_headers \
-        install_libexec_scripts install_bins
+         install_libexec_scripts install_bins install_docs
 
 install_bins: $(INSTALL_BINS)
        $(INSTALL_DIR) $(DESTDIR)$(bindir)
@@ -727,6 +727,17 @@ install_headers: $(INSTALL_HEADERS)
                $(INSTALL_HEADER) $(INSTALL_OPTS) $$i $(DESTDIR)$(headerdir); \
        done
 
+install_docs: $(INSTALL_HEADERS)
+       $(INSTALL_DIR) $(DESTDIR)$(docdir)
+       for i in $(INSTALL_DOCS); do \
+               $(INSTALL_DOC) $(INSTALL_OPTS) $$i $(DESTDIR)$(docdir); \
+       done
+       $(INSTALL_DIR) $(INSTALL_OPTS) $(DESTDIR)$(docdir)/html; \
+       for i in $(INSTALL_HTML_DOC_DIRS); do \
+               $(INSTALL_DIR) $(INSTALL_OPTS) $(DESTDIR)$(docdir)/html/`basename $$i`; \
+               $(INSTALL_DOC) $(INSTALL_OPTS) $$i/* $(DESTDIR)$(docdir)/html/`basename $$i`; \
+       done
+
 INSTALLED_PACKAGE_CONF=$(DESTDIR)$(libdir)/package.conf
 
 # Install packages in the right order, so that ghc-pkg doesn't complain.

diff --git a/mk/config.mk.in b/mk/config.mk.in
index 8c33bb2..fa9720d 100644 (file)
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -500,6 +500,7 @@ INSTALL_SHLIB   = $(INSTALL) -m 755
 INSTALL_DATA    = $(INSTALL) -m 644
 INSTALL_HEADER  = $(INSTALL) -m 644
 INSTALL_MAN     = $(INSTALL) -m 644
+INSTALL_DOC     = $(INSTALL) -m 644
 INSTALL_DIR     = $(MKDIRHIER)
 
 #

diff --git a/rules/docbook.mk b/rules/docbook.mk
index bbcf41c..9b8a4f1 100644 (file)
--- a/rules/docbook.mk
+++ b/rules/docbook.mk
@@ -39,6 +39,8 @@ $1/$2/index.html: $$($1_DOCBOOK_SOURCES)
                       $$(XSLTPROC_HTML_STYLESHEET) \
                       $1/$2.xml
        cp mk/fptools.css $$(dir $$@)
+
+INSTALL_HTML_DOC_DIRS += $1/$2
 else
 html_$1 :
        @echo "*** HTML documentation is disabled; BUILD_DOCBOOK_HTML = NO"
@@ -53,6 +55,8 @@ ps_$1 : $1/$2.ps
 
 $1/$2.ps: $$($1_DOCBOOK_SOURCES)
        "$$(DBLATEX)" $$(DBLATEX_OPTS) $1/$2.xml --ps -o $$@
+
+INSTALL_DOCS += $1/$2.ps
 else
 ps_$1 :
        @echo "*** PS documentation is disabled; BUILD_DOCBOOK_PS = NO"
@@ -67,6 +71,8 @@ pdf_$1 : $1/$2.pdf
 
 $1/$2.pdf: $$($1_DOCBOOK_SOURCES)
        "$$(DBLATEX)" $$(DBLATEX_OPTS) $1/$2.xml --pdf -o $$@
+
+INSTALL_DOCS += $1/$2.pdf
 else
 pdf_$1 :
        @echo "*** PDF documentation is disabled; BUILD_DOCBOOK_PDF = NO"