[PATCH 04/11] Pass --with-haddock and --with-ghc to haddock, --package-db to cabal configure (fixed linebreaks)
---
hlibrary.mk | 4 ++--
hlibrary.mk.orig | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/hlibrary.mk b/hlibrary.mk
index 20e831a..1e16de9 100644
--- a/hlibrary.mk
+++ b/hlibrary.mk
@@ -113,7 +113,7 @@ $(DEB_SETUP_BIN_NAME):
for setup in Setup.lhs Setup.hs; do if test -e $$setup; then ghc --make $$setup -o $(DEB_SETUP_BIN_NAME); exit 0; fi; done
configure-ghc-stamp: $(DEB_SETUP_BIN_NAME)
- $(DEB_SETUP_BIN_NAME) configure --ghc -v2 \
+ $(DEB_SETUP_BIN_NAME) configure --ghc -v2 --package-db=/var/lib/ghc/package.conf.d \
--prefix=/usr --libdir=/usr/lib/haskell-packages/ghc/lib \
--builddir=dist-ghc \
--ghc-options="-optl$$(dpkg-buildflags --get LDFLAGS)" \
@@ -145,7 +145,7 @@ endif
build/libghc-$(CABAL_PACKAGE)-prof build/libghc-$(CABAL_PACKAGE)-dev:: build-ghc-stamp check-ghc-stamp
build-haddock-stamp:
- [ ! -x /usr/bin/haddock ] || $(DEB_SETUP_BIN_NAME) haddock --builddir=dist-ghc $(DEB_HADDOCK_OPTS) || \
+ [ ! -x /usr/bin/haddock ] || $(DEB_SETUP_BIN_NAME) haddock --builddir=dist-ghc --with-haddock=/usr/bin/haddock --with-ghc=ghc $(DEB_HADDOCK_OPTS) || \
echo "Haddock failed (no modules?), creating empty documentation package."
touch build-haddock-stamp
diff --git a/hlibrary.mk.orig b/hlibrary.mk.orig
index 5408863..237efd1 100644
--- a/hlibrary.mk.orig
+++ b/hlibrary.mk.orig
@@ -113,7 +113,7 @@ $(DEB_SETUP_BIN_NAME):
for setup in Setup.lhs Setup.hs; do if test -e $$setup; then ghc --make $$setup -o $(DEB_SETUP_BIN_NAME); exit 0; fi; done
configure-ghc-stamp: $(DEB_SETUP_BIN_NAME)
- $(DEB_SETUP_BIN_NAME) configure --ghc -v2 \
+ $(DEB_SETUP_BIN_NAME) configure --ghc -v2 --package-db=/var/lib/ghc/package.conf.d \
--prefix=/usr --libdir=/usr/lib/haskell-packages/ghc/lib \
--builddir=dist-ghc \
--ghc-options="-optl$$(dpkg-buildflags --get LDFLAGS)" \
@@ -149,7 +149,7 @@ build-haddock-stamp:
echo "Haddock failed (no modules?), creating empty documentation package."
touch build-haddock-stamp
-build/haskell-$(CABAL_PACKAGE)-doc build/libghc-$(CABAL_PACKAGE)-doc:: configure-ghc-stamp build-haddock-stamp
+build/libghc-$(CABAL_PACKAGE)-doc:: configure-ghc-stamp build-haddock-stamp
dist-hugs: $(DEB_SETUP_BIN_NAME)
$(DEB_SETUP_BIN_NAME) configure --hugs --prefix=/usr -v2 --builddir=dist-hugs $(DEB_SETUP_HUGS_CONFIGURE_ARGS)
@@ -193,7 +193,7 @@ install/libghc-$(CABAL_PACKAGE)-prof:: debian/tmp-inst-ghc install/libghc-$(CABA
dh_haskell_provides -p$(notdir $@)
dh_haskell_depends -p$(notdir $@)
-install/haskell-$(CABAL_PACKAGE)-doc install/libghc-$(CABAL_PACKAGE)-doc:: debian/tmp-inst-ghc build-haddock-stamp debian/extra-depends
+install/libghc-$(CABAL_PACKAGE)-doc:: debian/tmp-inst-ghc build-haddock-stamp debian/extra-depends
mkdir -p debian/$(notdir $@)/$(DEB_HADDOCK_HTML_DIR)
cd debian/tmp-inst-ghc/ ; find ./$(DEB_HADDOCK_HTML_DIR)/ \
! -name "*.haddock" -exec install -Dm 644 '{}' \
--
1.9.1
Reply to: