[Pkg-haskell-commits] darcs: ghc: Refresh patch use-debian-gen_contents_index

[Joachim Breitner]

Sat Mar  5 13:38:51 UTC 2011  Joachim Breitner <mail at joachim-breitner.de>
  * Refresh patch use-debian-gen_contents_index
  Ignore-this: 3502c964c1586a5d24fb762d13d2973b

    M ./patches/use-debian-gen_contents_index -12 +12

Sat Mar  5 13:38:51 UTC 2011  Joachim Breitner <mail at joachim-breitner.de>
  * Refresh patch use-debian-gen_contents_index
  Ignore-this: 3502c964c1586a5d24fb762d13d2973b
diff -rN -u old-ghc/patches/use-debian-gen_contents_index new-ghc/patches/use-debian-gen_contents_index
--- old-ghc/patches/use-debian-gen_contents_index	2011-03-05 13:40:19.552380286 +0000
+++ new-ghc/patches/use-debian-gen_contents_index	2011-03-05 13:40:19.568381128 +0000
@@ -1,8 +1,8 @@
-Index: ghc-7.0.1/ghc.mk
+Index: ghc-7.0.2/ghc.mk
 ===================================================================
---- ghc-7.0.1.orig/ghc.mk	2011-01-15 12:30:20.000000000 +0530
-+++ ghc-7.0.1/ghc.mk	2011-01-15 12:42:21.000000000 +0530
-@@ -694,7 +694,6 @@
+--- ghc-7.0.2.orig/ghc.mk	2011-03-05 19:00:15.000000000 +0530
++++ ghc-7.0.2/ghc.mk	2011-03-05 19:08:36.000000000 +0530
+@@ -698,7 +698,6 @@
  # Build the Haddock contents and index
  ifeq "$(HADDOCK_DOCS)" "YES"
  libraries/index.html: $(ALL_HADDOCK_FILES)
@@ -10,21 +10,21 @@
  $(eval $(call all-target,library_doc_index,libraries/index.html))
  INSTALL_LIBRARY_DOCS += libraries/*.html libraries/*.gif libraries/*.css libraries/*.js
  CLEAN_FILES += libraries/doc-index* libraries/haddock*.css \
-@@ -887,12 +886,8 @@
- 	$(INSTALL_DIR) $(INSTALL_OPTS) "$(DESTDIR)$(docdir)/html"
- 	$(INSTALL_DOC) $(INSTALL_OPTS) docs/index.html "$(DESTDIR)$(docdir)/html"
+@@ -891,12 +890,8 @@
+ 	$(call INSTALL_DIR,"$(DESTDIR)$(docdir)/html")
+ 	$(call INSTALL_DOC,$(INSTALL_OPTS),docs/index.html,"$(DESTDIR)$(docdir)/html")
  ifneq "$(INSTALL_LIBRARY_DOCS)" ""
--	$(INSTALL_DIR) $(INSTALL_OPTS) "$(DESTDIR)$(docdir)/html/libraries"
+-	$(call INSTALL_DIR,"$(DESTDIR)$(docdir)/html/libraries")
 -	for i in $(INSTALL_LIBRARY_DOCS); do \
--		$(INSTALL_DOC) $(INSTALL_OPTS) $$i "$(DESTDIR)$(docdir)/html/libraries/"; \
+-		$(call 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/"
+ 	$(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 \
-@@ -1000,7 +995,6 @@
+@@ -1004,7 +999,6 @@
      mk/project.mk \
      mk/install.mk.in \
      bindist.mk \