From: Debian Haskell Group <pkg-haskell-maintainers@lists.alioth.debian.org>
Date: Sat, 16 Jun 2012 10:48:18 +0000 (+0000)
Subject: use-debian-gen_contents_index
X-Git-Tag: archive/raspbian/8.0.2-9+rpi1~1^2^2^2^2^2^2~10
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=9ed7d0d7963997df002dec5a37a6d4ea7ddc4456;p=ghc.git

use-debian-gen_contents_index

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

Gbp-Pq: Name use-debian-gen_contents_index
---

diff --git a/ghc.mk b/ghc.mk
index 01866ff8..d0ebf568 100644
--- a/ghc.mk
+++ b/ghc.mk
@@ -666,7 +666,6 @@ $(foreach p,$(PACKAGES_STAGE0),$(eval libraries/$p_dist-boot_DO_HADDOCK = NO))
 # 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 @@ 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 \
@@ -946,7 +941,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 \