diff options
| author | Clint Adams <clint@debian.org> | 2018-04-12 12:13:17 -0400 |
|---|---|---|
| committer | Clint Adams <clint@debian.org> | 2018-04-12 12:13:17 -0400 |
| commit | 31cecf5c5a620b7509a644fc58d1a311d12b4ed7 (patch) | |
| tree | 89a6b4b84436c14bbeb8dc03ffca08799903350c | |
| parent | 7b047caf1e5a873f74242be67938b35f4517bf7d (diff) | |
Turn off wordwrap on verbose register --gen-pkg-config output.
data-default-instances-containers-0.0.1.conf is long enough to
cause trouble by hitting the hard 79 margin.
| -rw-r--r-- | Dh_Haskell.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Dh_Haskell.sh b/Dh_Haskell.sh index 3669042..39c6ba4 100644 --- a/Dh_Haskell.sh +++ b/Dh_Haskell.sh @@ -502,7 +502,7 @@ haddock_recipe(){ extra_depends_recipe(){ # local PS5=$PS4; PS4=" + extra_depends_recipe> "; set -x hc=$1 - pkg_config=`LC_ALL=C.UTF-8 ${DEB_SETUP_BIN_NAME} register --builddir=dist-${hc} --gen-pkg-config --verbose=2 | sed -r -n '/^Creating package registration file: /s///p'` + pkg_config=$(LC_ALL=C.UTF-8 ${DEB_SETUP_BIN_NAME} register --builddir=dist-${hc} --gen-pkg-config --verbose=verbose+nowrap | sed -r -n '/^Creating package registration file: /s///p') run dh_haskell_extra_depends ${hc} $pkg_config rm $pkg_config # PS4=$PS5 @@ -519,7 +519,7 @@ install_dev_recipe(){ ( run cd debian/tmp-inst-${hc} ; run mkdir -p ${libdir} ; run find ${libdir}/ \ \( ! -name "*_p.a" ! -name "*.p_hi" ! -type d \) \ -exec install -Dm 644 '{}' ../${PKG}/'{}' ';' ) - pkg_config=`LC_ALL=C.UTF-8 ${DEB_SETUP_BIN_NAME} register --builddir=dist-${hc} --gen-pkg-config --verbose=2 | sed -r -n '/^Creating package registration file: /s///p'` + pkg_config=$(LC_ALL=C.UTF-8 ${DEB_SETUP_BIN_NAME} register --builddir=dist-${hc} --gen-pkg-config --verbose=verbose+nowrap | sed -r -n '/^Creating package registration file: /s///p') if [ "${HASKELL_HIDE_PACKAGES}" ]; then sed -i 's/^exposed: True$/exposed: False/' $pkg_config; fi run install -Dm 644 $pkg_config debian/${PKG}/${pkgdir}/$pkg_config run rm -f $pkg_config |