[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[PATCH 07/11] Turn the Make rules into shell functions (fixed linebreaks)



---
 Dh_Haskell.sh      | 137 +++++++++++++++++++++++
 Dh_Haskell.sh.orig | 322 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 hlibrary.mk        |  79 +++----------
 hlibrary.mk.orig   |   2 +-
 4 files changed, 475 insertions(+), 65 deletions(-)
 create mode 100644 Dh_Haskell.sh.orig

diff --git a/Dh_Haskell.sh b/Dh_Haskell.sh
index f0a2002..4e56b64 100644
--- a/Dh_Haskell.sh
+++ b/Dh_Haskell.sh
@@ -283,6 +283,143 @@ find_config_for_ghc(){
     done
 }
 
+clean_recipe(){
+    DEB_SETUP_BIN_NAME=$1
+    CABAL_PACKAGE=$2
+    MAKEFILE=$3
+    DEB_LINTIAN_OVERRIDES_FILE=$4
+    [ ! -x "${DEB_SETUP_BIN_NAME}" ] || ${DEB_SETUP_BIN_NAME} clean
+    rm -rf dist dist-ghc dist-hugs ${DEB_SETUP_BIN_NAME} Setup.hi Setup.ho Setup.o .*config*
+    rm -f configure-ghc-stamp build-ghc-stamp build-hugs-stamp build-haddock-stamp
+    rm -rf debian/tmp-inst-ghc
+    rm -f debian/extra-depends
+    rm -f debian/libghc-${CABAL_PACKAGE}-doc.links
+    if [ -f ${DEB_LINTIAN_OVERRIDES_FILE} ] ; then					\
+      sed -i '/binary-or-shlib-defines-rpath/ d' ${DEB_LINTIAN_OVERRIDES_FILE} ;	\
+      find ${DEB_LINTIAN_OVERRIDES_FILE} -empty -delete;				\
+    fi
+
+    rm -f ${MAKEFILE}
+    rm -rf debian/dh_haskell_shlibdeps
+}
+
+make_setup_recipe(){
+    DEB_SETUP_BIN_NAME=$1
+    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_recipe(){
+    DEB_SETUP_BIN_NAME=$1
+    CABAL_PACKAGE=$2
+    DEB_HADDOCK_DIR=$3
+    DEB_HADDOCK_HTML_DIR=$4
+    ENABLE_PROFILING=$5
+    NO_GHCI_FLAG=$6
+    DEB_SETUP_GHC6_CONFIGURE_ARGS=$7
+    DEB_SETUP_GHC_CONFIGURE_ARGS=$8
+    OPTIMIZATION=$9
+    TESTS=$10
+    COMPILERS=$11
+
+    local GHC_OPTIONS
+    for i in `dpkg-buildflags --get LDFLAGS`; do GHC_OPTIONS="$GHC_OPTIONS -optl$i"; done
+
+    ${DEB_SETUP_BIN_NAME} configure ${COMPILERS} -v2 --package-db=/var/lib/ghc/package.conf.d \
+        --prefix=/usr --libdir=/usr/lib/haskell-packages/ghc/lib \
+	--builddir=dist-ghc \
+       --ghc-options="${GHC_OPTIONS}" \
+	--haddockdir=${DEB_HADDOCK_DIR} --datasubdir=${CABAL_PACKAGE}\
+	--htmldir=${DEB_HADDOCK_HTML_DIR} ${ENABLE_PROFILING} ${NO_GHCI_FLAG} \
+	${DEB_SETUP_GHC6_CONFIGURE_ARGS} ${DEB_SETUP_GHC_CONFIGURE_ARGS} ${OPTIMIZATION} ${TESTS}
+}
+
+build_recipe(){
+    DEB_SETUP_BIN_NAME=$1
+    COMPILER=$2
+    ${DEB_SETUP_BIN_NAME} build --builddir=dist-${COMPILER}
+}
+
+check_recipe(){
+    DEB_SETUP_BIN_NAME=$1
+    DEB_DEFAULT_COMPILER=$2
+    DEB_PACKAGES=$3
+    hc=`packages_hc "${DEB_DEFAULT_COMPILER}" "${DEB_PACKAGES}"`
+    ${DEB_SETUP_BIN_NAME} test --builddir=dist-${hc} --show-details=always
+}
+
+haddock_recipe(){
+    DEB_SETUP_BIN_NAME=$1
+    DEB_HADDOCK_OPTS=$2
+    COMPILER=$3
+    [ ! -x /usr/bin/haddock ] || ${DEB_SETUP_BIN_NAME} haddock --builddir=dist-${COMPILER} --with-haddock=/usr/bin/haddock --with-ghc=${COMPILER} ${DEB_HADDOCK_OPTS} || \
+	  echo "Haddock failed (no modules?), creating empty documentation package."
+}
+
+extra_depends_recipe(){
+    DEB_SETUP_BIN_NAME=$1
+    pkg_config=`${DEB_SETUP_BIN_NAME} register --builddir=dist-ghc --gen-pkg-config | tr -d ' \n' | sed -r 's,^.*:,,'`
+    dh_haskell_extra_depends $pkg_config
+    rm $pkg_config
+}
+
+install_dev_recipe(){
+    DEB_SETUP_BIN_NAME=$1
+    CABAL_PACKAGE=$2
+    CABAL_VERSION=$3
+    HASKELL_HIDE_PACKAGES=$4
+    DEB_GHC_EXTRA_PACKAGES=$5
+    DEB_LINTIAN_OVERRIDES_FILE=$6
+    PKG=$7
+    ( cd debian/tmp-inst-ghc ; mkdir -p usr/lib/haskell-packages/ghc/lib ; find usr/lib/haskell-packages/ghc/lib/ \
+    	\( ! -name "*_p.a" ! -name "*.p_hi" ! -type d \) \
+    	-exec install -Dm 644 '{}' ../${PKG}/'{}' ';' )
+    pkg_config=`${DEB_SETUP_BIN_NAME} register --builddir=dist-ghc --gen-pkg-config | tr -d ' \n' | sed -r 's,^.*:,,'`
+    if [ "${HASKELL_HIDE_PACKAGES}" ]; then sed -i 's/^exposed: True$/exposed: False/' $pkg_config; fi
+    install -Dm 644 $pkg_config debian/${PKG}/var/lib/ghc/package.conf.d/$pkg_config
+    rm -f $pkg_config
+    if [ "z${DEB_GHC_EXTRA_PACKAGES}" != "z" ] ; then
+       mkdir -p debian/$(notdir $@)/usr/lib/haskell-packages/extra-packages; \
+    	echo '${DEB_GHC_EXTRA_PACKAGES}' > debian/${PKG}/usr/lib/haskell-packages/extra-packages/${CABAL_PACKAGE}-${CABAL_VERSION}
+    fi
+
+    grep -s binary-or-shlib-defines-rpath ${DEB_LINTIAN_OVERRIDES_FILE} \
+       || echo binary-or-shlib-defines-rpath >> ${DEB_LINTIAN_OVERRIDES_FILE}
+    dh_haskell_provides -p${PKG}
+    dh_haskell_depends -p${PKG}
+    dh_haskell_shlibdeps -p${PKG}
+}
+
+install_prof_recipe(){
+    PKG=$1
+    ( cd debian/tmp-inst-ghc ; mkdir -p usr/lib/haskell-packages/ghc/lib ; find usr/lib/haskell-packages/ghc/lib/ \
+        ! \( ! -name "*_p.a" ! -name "*.p_hi" \) \
+        -exec install -Dm 644 '{}' ../${PKG}/'{}' ';' )
+    dh_haskell_provides -p${PKG}
+    dh_haskell_depends -p${PKG}
+}
+
+install_doc_recipe(){
+    CABAL_PACKAGE=$1
+    DEB_HADDOCK_DIR=$2
+    DEB_HADDOCK_HTML_DIR=$3
+    DEB_ENABLE_HOOGLE=$4
+    DEB_HOOGLE_TXT_DIR=$5
+    PKG=$6
+    mkdir -p debian/${PKG}/${DEB_HADDOCK_HTML_DIR}
+    ( cd debian/tmp-inst-ghc/ ; find ./${DEB_HADDOCK_HTML_DIR} \
+    	! -name "*.haddock" ! -type d -exec install -Dm 644 '{}' \
+    	../${PKG}/'{}' ';' )
+    mkdir -p debian/${PKG}/${DEB_HADDOCK_DIR}
+    [ 0 = `ls debian/tmp-inst-ghc/${DEB_HADDOCK_DIR}/ 2>/dev/null | wc -l` ] ||
+    	cp -r debian/tmp-inst-ghc/${DEB_HADDOCK_DIR}/*.haddock \
+    	    debian/${PKG}/${DEB_HADDOCK_DIR}
+    if [ "${DEB_ENABLE_HOOGLE}" = "yes" ]; then
+        find debian/${PKG}/${DEB_HADDOCK_HTML_DIR} -name "*.txt" \
+            -printf "%p ${DEB_HOOGLE_TXT_DIR}/${PKG}.txt\n" >> debian/libghc-${CABAL_PACKAGE}-doc.links
+        sed -i s,^debian/libghc-${CABAL_PACKAGE}-doc,, debian/libghc-${CABAL_PACKAGE}-doc.links
+    fi
+    dh_haskell_depends -p${PKG}
+}
 
 if ! [ `which grep-dctrl` > /dev/null ] ; then
     echo "grep-dctrl is missing" >&2
diff --git a/Dh_Haskell.sh.orig b/Dh_Haskell.sh.orig
new file mode 100644
index 0000000..f0a2002
--- /dev/null
+++ b/Dh_Haskell.sh.orig
@@ -0,0 +1,322 @@
+cpu(){
+  ghc -e 'putStr System.Info.arch'
+}
+
+os(){
+  ghc -e 'putStr System.Info.os'
+}
+
+package_prefix(){
+    echo $1 | sed -n -e 's|^\([^-]*\)-.*-[^-]*$|\1|p'
+}
+
+package_hc(){
+    echo $1 | sed -n -e 's|^lib\([^-]*\)-.*-[^-]*$|\1|p'
+}
+
+package_ext(){
+    case $1 in
+	# I'm told the ghc build uses these scripts, hence these special cases
+	ghc) echo "dev";;
+	ghc-prof) echo "prof";;
+	*) echo $1 | sed -n -e 's|^[^-]*-.*-\([^-]*\)$|\1|p';;
+    esac
+}
+
+packages_hc(){
+    DEB_DEFAULT_COMPILER=$1
+    DEB_PACKAGES=$2
+    hcs=`{ for i in ${DEB_PACKAGES}; do package_hc $i; done; } | sort -u`
+    if [ `echo ${hcs} | wc -w` = 0 ]; then hcs=${DEB_DEFAULT_COMPILER}; fi
+    if [ `echo ${hcs} | wc -w` != 1 ]; then echo "Multiple compilers not supported: ${hc}"; exit 1; fi
+    echo ${hcs}
+}
+
+hc_libdir(){
+    case $1 in
+      ghc) echo "usr/lib/haskell-packages/ghc/lib";;
+      *) echo "Don't know package_libdir for $1" >&2; exit 1;;
+    esac
+}
+
+package_libdir(){
+    hc_libdir `package_hc $1`
+}
+
+hc_pkgdir(){
+    case $1 in
+	ghc) echo "var/lib/ghc/package.conf.d";;
+        *) echo "Don't know pkgdir for $1" >&2; exit 1;;
+    esac
+}
+
+package_pkgdir(){
+    hc_pkgdir `package_hc $1`
+}
+
+hc_prefix(){
+    case $1 in
+      ghc) echo "usr";;
+      *) echo "Don't know prefix for compiler $1" >&2; exit 1;;
+    esac
+}
+
+hc_haddock(){
+    case $1 in
+	ghc) echo "haddock";;
+	*) echo "Don't know pkgdir for $1" >&2; exit 1;;
+    esac
+}
+
+strip_hash(){
+	echo "$1" | sed 's/-................................$//'
+}
+
+sort_uniq(){
+    {
+	for i in "$@" ; do
+	    echo $i
+	done
+    } | sort -u | tr "\n" " "
+}
+
+dependency(){
+    local package
+    local version
+    local next_upstream_version
+    package=$1
+    version=`dpkg-query --showformat='${Version}' -W $package`
+    next_upstream_version=`echo $version | sed  -e 's/-[^-]*$//' -e 's/$/+/'`
+    echo "$package (>= $version), $package (<< $next_upstream_version)"
+}
+
+ghc_pkg_field(){
+    ghc-pkg --global field $@ | head -n1
+}
+
+providing_package_for_ghc(){
+    local package
+    local dep
+    local dir
+    local dirs
+    local lib
+    dep=`strip_hash $1`
+    dirs=`ghc_pkg_field $dep library-dirs | grep -i ^library-dirs | cut -d':' -f 2`
+    lib=`ghc_pkg_field $dep hs-libraries | grep -i ^hs-libraries |  sed -e 's|hs-libraries: *\([^ ]*\).*|\1|' `
+    for dir in $dirs ; do
+	if [ -e "${dir}/lib${lib}.a" ] ; then
+	    package=`dpkg-query -S ${dir}/lib${lib}.a | cut -d':' -f 1` || exit $?
+	    continue
+	fi
+    done
+    echo $package
+}
+
+providing_package_for_ghc_prof(){
+    local package
+    local dep
+    local dir
+    local dirs
+    local lib
+    dep=`strip_hash $1`
+    dirs=`ghc_pkg_field $dep library-dirs | grep -i ^library-dirs | cut -d':' -f 2`
+    lib=`ghc_pkg_field $dep hs-libraries | grep -i ^hs-libraries | sed -e 's|hs-libraries: *\([^ ]*\).*|\1|' `
+    for dir in $dirs ; do
+	if [ -e "${dir}/lib${lib}_p.a" ] ; then
+	    package=`dpkg-query -S ${dir}/lib${lib}_p.a | cut -d':' -f 1` || exit $?
+	    continue
+	fi
+    done
+    echo $package
+}
+
+cabal_package_ids(){
+    local config
+    local package_ids
+    until [ -z "$1" ]
+    do
+      config=$1
+      package_ids="$package_ids `grep-dctrl -n -i -s Id "" $config`"
+      shift
+    done
+    echo $package_ids
+}
+
+cabal_depends(){
+    local config
+    local dep
+    local depends
+    local final_depends
+    until [ -z "$1" ]
+    do
+      config=$1
+      depends="$depends `grep-dctrl -n -i -s Depends "" $config | tr "," " "`"
+      shift
+    done
+    for dep in `sort_uniq $depends` ; do
+	# The package is not mentioned in the ignored package list with the same version
+	# or mentioned without any version in the ignored package list?
+	if  echo " $ignores " | grep -qv " $dep " &&
+	    echo " $ignores " | grep -qv " `echo $dep | sed s%-[0-9][.0-9a-zA-Z]*$%%` " ;
+	then
+	    final_depends="$final_depends $dep"
+	fi
+    done
+    echo $final_depends
+}
+
+hashed_dependency(){
+    local type
+    local pkgid
+    local virpkg
+    type=$1
+    pkgid=$2
+    virtual_pkg=`package_id_to_virtual_package $type $pkgid`
+    # As a transition measure, check if dpkg knows about this virtual package
+    if dpkg-query -W $virtual_pkg >/dev/null 2>/dev/null;
+    then
+   	 echo $virtual_pkg
+    fi
+}
+
+depends_for_ghc(){
+    local dep
+    local packages
+    local pkgid
+    for pkgid in `cabal_depends $@` ; do
+	dep=`hashed_dependency dev $pkgid`
+	if [ -z "$dep" ]
+	then
+	  pkg=`providing_package_for_ghc $pkgid`
+          if [ -n "$pkg" ]
+          then
+	      dep=`dependency $pkg`
+	      packages="$packages, $dep"
+	  else
+	      echo "WARNING: No Debian package provides haskell package $pkgid." >&2
+          fi
+        else
+	    packages="$packages, $dep"
+	fi
+    done
+
+    echo $packages | sed -e 's/^,[ ]*//'
+}
+
+depends_for_ghc_prof(){
+    local dep
+    local packages
+    local pkgid
+    for pkgid in `cabal_depends $@` ; do
+	dep=`hashed_dependency prof $pkgid`
+	if [ -z "$dep" ]
+	then
+	  pkg=`providing_package_for_ghc_prof $pkgid`
+          if [ -n "$pkg" ]
+          then
+	      dep=`dependency $pkg`
+	      packages="$packages, $dep"
+	  else
+	      echo "WARNING: No Debian package provides haskell package $pkgid." >&2
+          fi
+        else
+	    packages="$packages, $dep"
+	fi
+    done
+
+    echo $packages | sed -e 's/^,[ ]*//'
+}
+
+provides_for_ghc(){
+    local dep
+    local packages
+    for package_id in `cabal_package_ids $@` ; do
+	packages="$packages, `package_id_to_virtual_package dev $package_id`"
+    done
+    echo $packages | sed -e 's/^,[ ]*//'
+}
+
+provides_for_ghc_prof(){
+    local dep
+    local packages
+    for package_id in `cabal_package_ids $@` ; do
+	packages="$packages, `package_id_to_virtual_package prof $package_id`"
+    done
+    echo $packages | sed -e 's/^,[ ]*//'
+}
+
+package_id_to_virtual_package(){
+	local type
+	type="$1"
+	echo $2 | tr A-Z a-z | \
+            grep '[a-z0-9]\+-[0-9\.]\+-................................' | \
+		perl -pe 's/([a-z0-9-]+)-([0-9\.]+)-(.....).........................../libghc-\1-'$type'-\2-\3/'
+}
+
+depends_for_hugs(){
+    local version
+    local upstream_version
+    version=`dpkg-query --showformat='${Version}' -W hugs`
+    upstream_version=`echo $version | sed -e 's/-[^-]*$//'`
+    echo "hugs (>= $upstream_version)"
+}
+
+find_config_for_ghc(){
+    local f
+    local pkg
+    pkg=$1
+    case "$pkg" in
+	ghc-prof)
+	    pkg=ghc
+	    ;;
+	libghc-*-prof)
+	    pkg=`echo $pkg | sed -e 's/-prof$/-dev/'`
+	    ;;
+	*)
+	    ;;
+    esac
+    for f in debian/$pkg/var/lib/ghc/package.conf.d/*.conf ; do
+	if [ -f "$f" ] ; then
+	    echo $f
+	    echo " "
+	fi
+    done
+}
+
+
+if ! [ `which grep-dctrl` > /dev/null ] ; then
+    echo "grep-dctrl is missing" >&2
+    exit 1
+fi
+
+args=
+ignores=
+files=
+until [ -z "$1" ]
+do
+  case "$1" in
+      -X*)
+          pkg=${1##-X}
+	  ignores="$ignores $pkg"
+	  ;;
+
+      --exclude=*)
+	  pkg=${1##--exclude=}
+	  ignores="$ignores $pkg"
+	  ;;
+
+      -*)
+	  args="$args $1"
+	  ;;
+      *)
+	  if [ -f $1 ] ; then
+	      files="$files $1"
+	  else
+	      echo "Installed package description file $1 can not be found" >&2
+	      exit 1
+	  fi
+	  ;;
+  esac
+  shift
+done
+
diff --git a/hlibrary.mk b/hlibrary.mk
index 1e16de9..c7a4bf2 100644
--- a/hlibrary.mk
+++ b/hlibrary.mk
@@ -95,41 +95,26 @@ endif
 DEB_BUILD_DEPENDENCIES = build-arch
 
 clean::
-	[ ! -x "$(DEB_SETUP_BIN_NAME)" ] || $(DEB_SETUP_BIN_NAME) clean
-	rm -rf dist dist-ghc dist-hugs $(DEB_SETUP_BIN_NAME) Setup.hi Setup.ho Setup.o .*config*
-	rm -f configure-ghc-stamp build-ghc-stamp build-hugs-stamp build-haddock-stamp
-	rm -rf debian/tmp-inst-ghc
-	rm -f debian/extra-depends
-	rm -f debian/libghc-$(CABAL_PACKAGE)-doc.links
-	if [ -f $(DEB_LINTIAN_OVERRIDES_FILE) ] ; then					\
-	    sed -i '/binary-or-shlib-defines-rpath/ d' $(DEB_LINTIAN_OVERRIDES_FILE) ;	\
-	    find $(DEB_LINTIAN_OVERRIDES_FILE) -empty -delete;				\
-	fi
-
-	rm -f $(MAKEFILE)
-	rm -rf debian/dh_haskell_shlibdeps
+	. /usr/share/haskell-devscripts/Dh_Haskell.sh && clean_recipe $(DEB_SETUP_BIN_NAME) $(CABAL_PACKAGE) $(MAKEFILE) $(DEB_LINTIAN_OVERRIDES_FILE)
 
 $(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
+	. /usr/share/haskell-devscripts/Dh_Haskell.sh && make_setup_recipe "$(DEB_SETUP_BIN_NAME)"
 
 configure-ghc-stamp: $(DEB_SETUP_BIN_NAME)
-	$(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)" \
-		--haddockdir=$(DEB_HADDOCK_DIR) --datasubdir=$(CABAL_PACKAGE)\
-		--htmldir=$(DEB_HADDOCK_HTML_DIR) $(ENABLE_PROFILING) $(NO_GHCI_FLAG) \
-		$(DEB_SETUP_GHC6_CONFIGURE_ARGS) $(DEB_SETUP_GHC_CONFIGURE_ARGS) $(OPTIMIZATION) $(TESTS)
+	. /usr/share/haskell-devscripts/Dh_Haskell.sh && \
+	  configure_recipe "$(DEB_SETUP_BIN_NAME)" "$(CABAL_PACKAGE)" "$(DEB_HADDOCK_DIR)" "$(DEB_HADDOCK_HTML_DIR)" \
+	    "$(ENABLE_PROFILING)" "$(NO_GHCI_FLAG)" "$(DEB_SETUP_GHC6_CONFIGURE_ARGS)" \
+	    "$(DEB_SETUP_GHC_CONFIGURE_ARGS)" "$(OPTIMIZATION)" "$(TESTS)" "--ghc"
 	touch $@
 
 build-ghc-stamp: configure-ghc-stamp
-	$(DEB_SETUP_BIN_NAME) build --builddir=dist-ghc
+	. /usr/share/haskell-devscripts/Dh_Haskell.sh && build_recipe "$(DEB_SETUP_BIN_NAME)" ghc
 	touch $@
 
 ifeq ($(DEB_ENABLE_TESTS),yes)
 ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
 check-ghc-stamp: build-ghc-stamp
-	$(DEB_SETUP_BIN_NAME) test --builddir=dist-ghc --show-details=always
+	. /usr/share/haskell-devscripts/Dh_Haskell.sh && check_recipe "$(DEB_SETUP_BIN_NAME)" "$(DEB_DEFAULT_COMPILER)" "$(DEB_PACKAGES)"
 	touch $@
 else
 check-ghc-stamp: build-ghc-stamp
@@ -145,8 +130,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 --with-haddock=/usr/bin/haddock --with-ghc=ghc $(DEB_HADDOCK_OPTS) || \
-	  echo "Haddock failed (no modules?), creating empty documentation package."
+	. /usr/share/haskell-devscripts/Dh_Haskell.sh && haddock_recipe "$(DEB_SETUP_BIN_NAME)" "$(DEB_HADDOCK_OPTS)" ghc
 	touch build-haddock-stamp
 
 build/libghc-$(CABAL_PACKAGE)-doc:: configure-ghc-stamp build-haddock-stamp
@@ -161,53 +145,20 @@ debian/tmp-inst-ghc: $(DEB_SETUP_BIN_NAME) build-ghc-stamp
 	$(DEB_SETUP_BIN_NAME) copy --builddir=dist-ghc --destdir=debian/tmp-inst-ghc
 
 debian/extra-depends: debian/tmp-inst-ghc
-	pkg_config=`$(DEB_SETUP_BIN_NAME) register --builddir=dist-ghc --gen-pkg-config | tr -d ' \n' | sed -r 's,^.*:,,'` ; \
-		dh_haskell_extra_depends $$pkg_config ; \
-		rm $$pkg_config
+	. /usr/share/haskell-devscripts/Dh_Haskell.sh && extra_depends_recipe "$(DEB_SETUP_BIN_NAME)"
 
 DEB_LINTIAN_OVERRIDES_FILE = debian/libghc-$(CABAL_PACKAGE)-dev.lintian-overrides
 
 install/libghc-$(CABAL_PACKAGE)-dev:: debian/tmp-inst-ghc debian/extra-depends
-	cd debian/tmp-inst-ghc ; mkdir -p usr/lib/haskell-packages/ghc/lib ; find usr/lib/haskell-packages/ghc/lib/ \
-		\( ! -name "*_p.a" ! -name "*.p_hi" \) \
-		-exec install -Dm 644 '{}' ../$(notdir $@)/'{}' ';'
-	pkg_config=`$(DEB_SETUP_BIN_NAME) register --builddir=dist-ghc --gen-pkg-config | tr -d ' \n' | sed -r 's,^.*:,,'`; \
-		$(if $(HASKELL_HIDE_PACKAGES),sed -i 's/^exposed: True$$/exposed: False/' $$pkg_config;) \
-		install -Dm 644 $$pkg_config debian/$(notdir $@)/var/lib/ghc/package.conf.d/$$pkg_config; \
-		rm -f $$pkg_config
-	if [ "z$(DEB_GHC_EXTRA_PACKAGES)" != "z" ] ; then \
-		mkdir -p debian/$(notdir $@)/usr/lib/haskell-packages/extra-packages; \
-		echo '$(DEB_GHC_EXTRA_PACKAGES)' > debian/$(notdir $@)/usr/lib/haskell-packages/extra-packages/$(CABAL_PACKAGE)-$(CABAL_VERSION) ; \
-	fi
-
-	grep -s binary-or-shlib-defines-rpath $(DEB_LINTIAN_OVERRIDES_FILE) \
-	     || echo binary-or-shlib-defines-rpath >> $(DEB_LINTIAN_OVERRIDES_FILE)
-	dh_haskell_provides -p$(notdir $@)
-	dh_haskell_depends -p$(notdir $@)
-	dh_haskell_shlibdeps -p$(notdir $@)
+	. /usr/share/haskell-devscripts/Dh_Haskell.sh && \
+	  install_dev_recipe "$(DEB_SETUP_BIN_NAME)" "$(CABAL_PACKAGE)" "$(CABAL_VERSION)" "$(HASKELL_HIDE_PACKAGES)" "$(DEB_GHC_EXTRA_PACKAGES)" $(DEB_LINTIAN_OVERRIDES_FILE) "$(notdir $@)"
 
 install/libghc-$(CABAL_PACKAGE)-prof:: debian/tmp-inst-ghc install/libghc-$(CABAL_PACKAGE)-dev debian/extra-depends
-	cd debian/tmp-inst-ghc ; mkdir -p usr/lib/haskell-packages/ghc/lib ; find usr/lib/haskell-packages/ghc/lib/ \
-		! \( ! -name "*_p.a" ! -name "*.p_hi" \) \
-		-exec install -Dm 644 '{}' ../$(notdir $@)/'{}' ';'
-	dh_haskell_provides -p$(notdir $@)
-	dh_haskell_depends -p$(notdir $@)
+	. /usr/share/haskell-devscripts/Dh_Haskell.sh && install_prof_recipe "$(notdir $@)"
 
 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 '{}' \
-		../$(notdir $@)/'{}' ';'
-	mkdir -p debian/$(notdir $@)/$(DEB_HADDOCK_DIR)
-	[ 0 = `ls debian/tmp-inst-ghc/$(DEB_HADDOCK_DIR)/ 2>/dev/null | wc -l` ] || \
-		cp -r debian/tmp-inst-ghc/$(DEB_HADDOCK_DIR)/*.haddock \
-		debian/$(notdir $@)/$(DEB_HADDOCK_DIR)
-ifeq ($(DEB_ENABLE_HOOGLE),yes)
-	find debian/$(notdir $@)/$(DEB_HADDOCK_HTML_DIR) -name "*.txt" \
-		-printf "%p $(DEB_HOOGLE_TXT_DIR)/$(notdir $@).txt\n" >> debian/libghc-$(CABAL_PACKAGE)-doc.links
-	sed -i s,^debian/libghc-$(CABAL_PACKAGE)-doc,, debian/libghc-$(CABAL_PACKAGE)-doc.links
-endif
-	dh_haskell_depends -p$(notdir $@)
+	. /usr/share/haskell-devscripts/Dh_Haskell.sh && \
+	  install_doc_recipe "$(CABAL_PACKAGE)" "$(DEB_HADDOCK_DIR)" "$(DEB_HADDOCK_HTML_DIR)" "$(DEB_ENABLE_HOOGLE)" "$(DEB_HOOGLE_TXT_DIR)" "$(notdir $@)"
 
 install/libhugs-$(CABAL_PACKAGE):: $(DEB_SETUP_BIN_NAME) dist-hugs debian/extra-depends
 	$(DEB_SETUP_BIN_NAME) copy --destdir=debian/libhugs-$(CABAL_PACKAGE) --builddir=dist-hugs
diff --git a/hlibrary.mk.orig b/hlibrary.mk.orig
index 237efd1..1e16de9 100644
--- a/hlibrary.mk.orig
+++ b/hlibrary.mk.orig
@@ -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


Reply to: