summaryrefslogtreecommitdiff
path: root/ghc.mk
diff options
context:
space:
mode:
authorBen Gamari <ben@smart-cactus.org>2016-04-06 23:40:44 +0200
committerBen Gamari <ben@smart-cactus.org>2016-04-07 15:27:08 +0200
commit6b6bebaf2349c51343bec2b8fa0e80b7e42593a6 (patch)
treea95e97eede044ff3b3487e2a060f8effe966b2a7 /ghc.mk
parent06b7ce21571cc6696ded6126098f0f596f4ba3ca (diff)
downloadhaskell-6b6bebaf2349c51343bec2b8fa0e80b7e42593a6.tar.gz
Fix installation of static sphinx assets
Previously the `_static` and `_sources` directories were installed in the wrong parents. See #11803
Diffstat (limited to 'ghc.mk')
-rw-r--r--ghc.mk8
1 files changed, 1 insertions, 7 deletions
diff --git a/ghc.mk b/ghc.mk
index 4034a92d4e..a9f5b06735 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