use-debian-gen_contents_index

===================================================================

Gbp-Pq: Name use-debian-gen_contents_index

diff --git a/ghc.mk b/ghc.mk
index ec9590a4edd6a714d321493538708af851f7e37c..b3a4e0274bd7e9f3aa1c70ca6733c15e8059fa20 100644 (file)
--- a/ghc.mk
+++ b/ghc.mk
@@ -824,7 +824,6 @@ endif
 # 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 @@ endif
        $(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 @@ $(eval $(call bindist-list,.,\
     mk/project.mk \
     mk/install.mk.in \
     bindist.mk \
-    libraries/gen_contents_index \
     libraries/prologue.txt \
     $(wildcard libraries/dph/LICENSE \
                libraries/dph/ghc-packages \