[Pkg-haskell-commits] darcs: ghc: Move some haddock files to the ghc-haddock package

[Joachim Breitner]

Sat Jan 15 09:38:21 UTC 2011  Joachim Breitner <mail at joachim-breitner.de>
  * Move some haddock files to the ghc-haddock package
  Ignore-this: 59171e989b5c5b554737d513593e317f

    M ./rules -2 +4

Sat Jan 15 09:38:21 UTC 2011  Joachim Breitner <mail at joachim-breitner.de>
  * Move some haddock files to the ghc-haddock package
  Ignore-this: 59171e989b5c5b554737d513593e317f
diff -rN -u old-ghc/rules new-ghc/rules
--- old-ghc/rules	2011-01-15 11:32:05.750623303 +0000
+++ new-ghc/rules	2011-01-15 11:32:05.870629621 +0000
@@ -163,7 +163,9 @@
 	if inplace/bin/ghc-stage2 --info | grep '"Have interpreter","NO"'; then \
 	    cd debian/tmp/usr/lib/ghc-$(ProjectVersion) ;rm -f bin/ghci* bin/runghc* bin/runhaskell*; \
 	fi
-	rm -f debian/tmp/usr/lib/ghc-$(ProjectVersion)/bin/haddock debian/tmp/usr/lib/ghc-$(ProjectVersion)/lib/haddock
+	rm -f debian/tmp/usr/lib/ghc-$(ProjectVersion)/bin/haddock \
+	      debian/tmp/usr/lib/ghc-$(ProjectVersion)/bin/haddock-$(ProjectVersion) \
+	      debian/tmp/usr/lib/ghc-$(ProjectVersion)/lib/haddock
 	cd debian/tmp/usr/lib/ghc-$(ProjectVersion)/bin && \
 	    for f in *-$(ProjectVersion); \
 	    do ln -s /usr/lib/ghc-$(ProjectVersion)/bin/$$f \
@@ -217,7 +219,6 @@
 	# ghc6
 	find debian/tmp/usr/bin $(FILES) ! -name haddock  > debian/ghc6.install
 #	find debian/tmp/usr/share/ghc* $(FILES)          >> debian/ghc6.install
-	find debian/tmp/usr/share/haddock-* $(FILES)	 >> debian/ghc6.install
 	find debian/tmp/usr/share/man $(FILES)           >> debian/ghc6.install
 	find debian/tmp/usr/lib/ghc-$(ProjectVersion) $(FILES) ! $(PROF_FILE) ! $(DYNAMIC_FILE) >> debian/ghc6.install
 	find debian/tmp/var				 >> debian/ghc6.install
@@ -230,6 +231,7 @@
 	echo debian/lintian-overrides/ghc6-dynamic /usr/share/lintian/overrides >> debian/ghc6-dynamic.install
 	# haddock
 	echo usr/bin/haddock				 > debian/ghc6-haddock.install
+	find debian/tmp/usr/share/haddock-* $(FILES)	 >> debian/ghc6-haddock.install
 	# ghc6-doc
 ifeq (YES,$(BUILD_HADDOCK_DOCS))
 	find debian/tmp/usr/share/doc/ghc6-doc $(FILES) > debian/ghc6-doc.install