[commit: ghc] master: Fix installation of static sphinx assets (6b6beba)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/6b6bebaf2349c51343bec2b8fa0e80b7e42593a6/ghc

>---------------------------------------------------------------

commit 6b6bebaf2349c51343bec2b8fa0e80b7e42593a6
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Wed Apr 6 23:40:44 2016 +0200

    Fix installation of static sphinx assets
    
    Previously the `_static` and `_sources` directories were installed in
    the wrong parents. See #11803


>---------------------------------------------------------------

6b6bebaf2349c51343bec2b8fa0e80b7e42593a6
 ghc.mk          | 8 +-------
 rules/sphinx.mk | 2 +-
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/ghc.mk b/ghc.mk
index 4034a92..a9f5b06 100644
--- a/ghc.mk
+++ b/ghc.mk
@@ -950,14 +950,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
 
diff --git a/rules/sphinx.mk b/rules/sphinx.mk
index 7337242..52fbe28 100644
--- a/rules/sphinx.mk
+++ b/rules/sphinx.mk
@@ -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