Fix installation of static sphinx assets
authorBen Gamari <ben@smart-cactus.org>
Wed, 6 Apr 2016 21:40:44 +0000 (23:40 +0200)
committerBen Gamari <ben@smart-cactus.org>
Fri, 8 Apr 2016 00:24:04 +0000 (02:24 +0200)
Previously the `_static` and `_sources` directories were installed in
the wrong parents. See #11803

(cherry picked from commit 6b6bebaf2349c51343bec2b8fa0e80b7e42593a6)

ghc.mk
rules/sphinx.mk

diff --git a/ghc.mk b/ghc.mk
index 5e4ecc6..44e2a23 100644 (file)
--- a/ghc.mk
+++ b/ghc.mk
@@ -952,14 +952,8 @@ ifneq "$(INSTALL_LIBRARY_DOCS)" ""
        $(INSTALL_SCRIPT) $(INSTALL_OPTS) libraries/gen_contents_index "$(DESTDIR)$(docdir)/html/libraries/"
 endif
 ifneq "$(INSTALL_HTML_DOC_DIRS)" ""
-# We need to filter out the directories so install doesn't choke on them
        for i in $(INSTALL_HTML_DOC_DIRS); do \
-               $(INSTALL_DIR) "$(DESTDIR)$(docdir)/html/`basename $$i`"; \
-               for f in $$i/*; do \
-                       if test -f $$f; then \
-                               $(INSTALL_DOC) $(INSTALL_OPTS) "$$f" "$(DESTDIR)$(docdir)/html/`basename $$i`"; \
-                       fi \
-               done \
+               $(CP) -Rp $$i "$(DESTDIR)$(docdir)/html"; \
        done
 endif
 
index 7337242..52fbe28 100644 (file)
@@ -31,7 +31,7 @@ $(call all-target,$1,)
 ifeq "$$(phase)" "final"
 ifeq "$$(BUILD_SPHINX_HTML)" "YES"
 $(call all-target,$1,html_$1)
-INSTALL_HTML_DOC_DIRS += $1/build-html/$2 $1/build-html/$2/_static $1/build-html/$2/_sources
+INSTALL_HTML_DOC_DIRS += $1/build-html/$2
 endif
 endif