Here we pass the values appropriate for ghc, later these get parameterized. --- hlibrary.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 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 -- 1.9.1 -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected] Archive: https://lists.debian.org/CAM8C2CB1fM9WKmYv_ntnkw_AQzLYfGu=4bfjtcfphyqe15m...@mail.gmail.com
