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-7.4.0.20111219/ghc.mk
===================================================================
--- ghc-7.4.0.20111219.orig/ghc.mk 2011-12-21 19:45:08.000000000 +0100
+++ ghc-7.4.0.20111219/ghc.mk 2011-12-21 19:51:20.000000000 +0100
@@ -666,7 +666,6 @@
# Build the Haddock contents and index
ifeq "$(HADDOCK_DOCS)" "YES"
libraries/index.html: inplace/bin/haddock$(exeext) $(ALL_HADDOCK_FILES)
- cd libraries && sh gen_contents_index --inplace
ifeq "$(phase)" "final"
$(eval $(call all-target,library_doc_index,libraries/index.html))
endif
@@ -833,12 +832,8 @@
$(call INSTALL_DIR,"$(DESTDIR)$(docdir)/html")
$(call INSTALL_DOC,$(INSTALL_OPTS),docs/index.html,"$(DESTDIR)$(docdir)/html")
ifneq "$(INSTALL_LIBRARY_DOCS)" ""
- $(call INSTALL_DIR,"$(DESTDIR)$(docdir)/html/libraries")
- for i in $(INSTALL_LIBRARY_DOCS); do \
- $(call INSTALL_DOC,$(INSTALL_OPTS),$$i,"$(DESTDIR)$(docdir)/html/libraries/"); \
- done
+ mkdir -p $(DESTDIR)$(docdir)/html/libraries/
$(call INSTALL_DATA,$(INSTALL_OPTS),libraries/prologue.txt,"$(DESTDIR)$(docdir)/html/libraries/")
- $(call 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 \
@@ -946,7 +941,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 \
|