blob: 31378a1a22dc8c8bc639aa13c298f0c9a3411e4b (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
|
Index: ghc/ghc.mk
===================================================================
--- ghc.orig/ghc.mk 2016-05-21 17:05:28.794690704 +0200
+++ ghc/ghc.mk 2016-05-21 17:05:28.790690606 +0200
@@ -824,7 +824,6 @@
# Build the Haddock contents and index
ifeq "$(HADDOCK_DOCS)" "YES"
libraries/dist-haddock/index.html: $(haddock_INPLACE) $(ALL_HADDOCK_FILES)
- cd libraries && sh gen_contents_index --intree
ifeq "$(phase)" "final"
$(eval $(call all-target,library_doc_index,libraries/dist-haddock/index.html))
endif
@@ -945,12 +944,8 @@
$(INSTALL_DIR) "$(DESTDIR)$(docdir)/html"
$(INSTALL_DOC) $(INSTALL_OPTS) docs/index.html "$(DESTDIR)$(docdir)/html"
ifneq "$(INSTALL_LIBRARY_DOCS)" ""
- $(INSTALL_DIR) "$(DESTDIR)$(docdir)/html/libraries"
- for i in $(INSTALL_LIBRARY_DOCS); do \
- $(INSTALL_DOC) $(INSTALL_OPTS) $$i "$(DESTDIR)$(docdir)/html/libraries/"; \
- done
+ mkdir -p $(DESTDIR)$(docdir)/html/libraries/
$(INSTALL_DATA) $(INSTALL_OPTS) libraries/prologue.txt "$(DESTDIR)$(docdir)/html/libraries/"
- $(INSTALL_SCRIPT) $(INSTALL_OPTS) libraries/gen_contents_index "$(DESTDIR)$(docdir)/html/libraries/"
endif
ifneq "$(INSTALL_HTML_DOC_DIRS)" ""
for i in $(INSTALL_HTML_DOC_DIRS); do \
@@ -1059,7 +1054,6 @@
mk/project.mk \
mk/install.mk.in \
bindist.mk \
- libraries/gen_contents_index \
libraries/prologue.txt \
$(wildcard libraries/dph/LICENSE \
libraries/dph/ghc-packages \
|
