aboutsummaryrefslogtreecommitdiffstats
path: root/debian
diff options
context:
space:
mode:
authorHelmut Grohne <helmut@subdivi.de>2017-12-11 21:22:42 +0000
committerManuel A. Fernandez Montecelo <manuel.montezelo@gmail.com>2017-12-11 21:22:42 +0000
commite4cb961cc1f29a79c759583b79b998e4d623b49c (patch)
treea880c3dd86c8ef870a01de3158637e854e691aca /debian
parentDebian release 0.5.3-34 (diff)
downloadw3m-e4cb961cc1f29a79c759583b79b998e4d623b49c.tar.gz
w3m-e4cb961cc1f29a79c759583b79b998e4d623b49c.zip
Partially fix FTCBFS (addresses: #812682)
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog9
-rwxr-xr-xdebian/rules7
2 files changed, 16 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 3245c4b..f89148a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+w3m (0.5.3-26.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Partially fix FTCBFS (addresses: #-1)
+ + Pass --host to configure
+ + export PKG_CONFIG
+
+ -- Helmut Grohne <helmut@subdivi.de> Mon, 25 Jan 2016 20:57:02 +0100
+
w3m (0.5.3-34) unstable; urgency=medium
* Update 020_debian.patch to v0.5.3+git20170102
diff --git a/debian/rules b/debian/rules
index 8dadfdf..b2d34f8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,7 @@
#!/usr/bin/make -f
+include /usr/share/dpkg/architecture.mk
+
#export DH_VERBOSE=1
export DEB_BUILD_MAINT_OPTIONS = hardening=+all
@@ -28,6 +30,11 @@ confargs := --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib \
--enable-image=$(DEVS) \
--enable-m17n --enable-unicode --enable-nls
+ifneq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
+confargs += --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE)
+export PKG_CONFIG=$(DEB_HOST_GNU_TYPE)-pkg-config
+endif
+
builddir := .
build-indep: