From 29816385eb10a7f7aa7f6c387656aadf235fe56b Mon Sep 17 00:00:00 2001 From: Debian Haskell Group Date: Wed, 5 Oct 2016 19:27:23 +0000 Subject: [PATCH] use-debian-gen_contents_index =================================================================== Gbp-Pq: Name use-debian-gen_contents_index --- ghc.mk | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/ghc.mk b/ghc.mk index 9aa0dc35..da4765aa 100644 --- a/ghc.mk +++ b/ghc.mk @@ -772,7 +772,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 @@ -881,12 +880,8 @@ endif $(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 \ @@ -998,7 +993,6 @@ $(eval $(call bindist,.,\ mk/project.mk \ mk/install.mk.in \ bindist.mk \ - libraries/gen_contents_index \ libraries/prologue.txt \ $(wildcard libraries/dph/LICENSE \ libraries/dph/ghc-packages \ -- 2.30.2