[Pkg-haskell-commits] darcs: ghc: Remove some haddock leftovers from ghc binary pacakge
Joachim Breitner
mail at joachim-breitner.de
Sat Jan 15 11:32:06 UTC 2011
Sat Jan 15 11:31:13 UTC 2011 Joachim Breitner <mail at joachim-breitner.de>
* Remove some haddock leftovers from ghc binary pacakge
Ignore-this: db449520124db3c8e70b58db316b4706
M ./rules -4 +9
Sat Jan 15 11:31:13 UTC 2011 Joachim Breitner <mail at joachim-breitner.de>
* Remove some haddock leftovers from ghc binary pacakge
Ignore-this: db449520124db3c8e70b58db316b4706
diff -rN -u old-ghc/rules new-ghc/rules
--- old-ghc/rules 2011-01-15 11:32:06.014637202 +0000
+++ new-ghc/rules 2011-01-15 11:32:06.050639097 +0000
@@ -118,7 +118,9 @@
cd debian/haddock-build/haddock; \
../../../inplace/bin/ghc-stage2 --make Setup.lhs; \
./Setup configure --prefix=/usr --with-compiler=../../../inplace/bin/ghc-stage2 \
- --package-db=../../../inplace/lib/package.conf.d/; \
+ --package-db=../../../inplace/lib/package.conf.d/ \
+ --htmldir=/usr/share/doc/ghc-haddock/html/ \
+ ; \
./Setup build
touch $@
@@ -158,14 +160,17 @@
endif
sed -ri 's,^haddock-interfaces: /.*?/libraries/,haddock-interfaces: /usr/lib/ghc-$(ProjectVersion)/haddock/,' debian/tmp/var/lib/ghc-$(ProjectVersion)/package.conf.d/*.conf
+ # Remove haddock as built within the ghc tree
+ 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
+ rm -rf debian/tmp/usr/lib/ghc-$(ProjectVersion)/html
+
# Sort out the binaries
mkdir -p debian/tmp/usr/bin
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)/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 \
More information about the Pkg-haskell-commits
mailing list