summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorManoj Srivastava <srivasta@debian.org>2016-01-15 13:19:27 -0800
committerManoj Srivastava <srivasta@debian.org>2016-01-15 13:43:56 -0800
commit93e1ce7347fadc2c878a96561a04a5164fe095fb (patch)
treed3cd31f2725fda5f0cc87c8c7a10eb71d8fba59e
parentd1656daa77f8d7ee22a696d1e77d01e9d7f14357 (diff)
[master]: Use dpkg-buildflags to set defaults for configure.debian/1%3.1-81-1
Signed-off-by: Manoj Srivastava <srivasta@debian.org>
-rw-r--r--debian/changelog3
-rw-r--r--[-rwxr-xr-x]debian/getspam0
-rw-r--r--[-rwxr-xr-x]debian/rc/sbin/mailagent.archive.pl0
-rw-r--r--[-rwxr-xr-x]debian/rc/sbin/mailagent.ctrlM.pl0
-rw-r--r--[-rwxr-xr-x]debian/rc/sbin/mailagent.deblog.pl0
-rw-r--r--[-rwxr-xr-x]debian/rc/sbin/mailagent.decnet.pl0
-rw-r--r--[-rwxr-xr-x]debian/rc/sbin/mailagent.log.pl0
-rw-r--r--[-rwxr-xr-x]debian/rc/sbin/unmime0
-rwxr-xr-xdebian/rules29
9 files changed, 17 insertions, 15 deletions
diff --git a/debian/changelog b/debian/changelog
index 5781bf6..5c4121d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,8 +8,9 @@ mailagent (1:3.1-81-1) unstable; urgency=low
rules check to match.
* Try to move towards reproducible builds; do not hard code local host
in the configuration step.
+ * use dpkg-buildflags to set the flags for configure to pick up.
- -- Manoj Srivastava <srivasta@debian.org> Fri, 15 Jan 2016 12:50:38 -0800
+ -- Manoj Srivastava <srivasta@debian.org> Fri, 15 Jan 2016 13:18:20 -0800
mailagent (1:3.1-78-1) unstable; urgency=low
diff --git a/debian/getspam b/debian/getspam
index 21b000f..21b000f 100755..100644
--- a/debian/getspam
+++ b/debian/getspam
diff --git a/debian/rc/sbin/mailagent.archive.pl b/debian/rc/sbin/mailagent.archive.pl
index 62798f6..62798f6 100755..100644
--- a/debian/rc/sbin/mailagent.archive.pl
+++ b/debian/rc/sbin/mailagent.archive.pl
diff --git a/debian/rc/sbin/mailagent.ctrlM.pl b/debian/rc/sbin/mailagent.ctrlM.pl
index be6cb5b..be6cb5b 100755..100644
--- a/debian/rc/sbin/mailagent.ctrlM.pl
+++ b/debian/rc/sbin/mailagent.ctrlM.pl
diff --git a/debian/rc/sbin/mailagent.deblog.pl b/debian/rc/sbin/mailagent.deblog.pl
index 41b2c9b..41b2c9b 100755..100644
--- a/debian/rc/sbin/mailagent.deblog.pl
+++ b/debian/rc/sbin/mailagent.deblog.pl
diff --git a/debian/rc/sbin/mailagent.decnet.pl b/debian/rc/sbin/mailagent.decnet.pl
index e5eac3e..e5eac3e 100755..100644
--- a/debian/rc/sbin/mailagent.decnet.pl
+++ b/debian/rc/sbin/mailagent.decnet.pl
diff --git a/debian/rc/sbin/mailagent.log.pl b/debian/rc/sbin/mailagent.log.pl
index 8d0460c..8d0460c 100755..100644
--- a/debian/rc/sbin/mailagent.log.pl
+++ b/debian/rc/sbin/mailagent.log.pl
diff --git a/debian/rc/sbin/unmime b/debian/rc/sbin/unmime
index 635f00c..635f00c 100755..100644
--- a/debian/rc/sbin/unmime
+++ b/debian/rc/sbin/unmime
diff --git a/debian/rules b/debian/rules
index 5cc8861..bb0cec7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -30,20 +30,21 @@ override_dh_auto_configure:
/bin/cp -rpf debian/Config .config && \
/bin/cp -pf debian/config.over config.over && \
touch .config/nomail && \
- sh ./Configure \
- -de \
- -D prefix=$(PREFIX) \
- -D orgname=/etc/news/organization \
- -D myhostname=localhost \
- -D mydomain=localdomain \
- -D defeditor=/usr/ae \
- -D usenm=no \
- -D privlib=/usr/share/$(package) \
- -D utmp="/var/run/utmp" \
- -D optimize="$(CFLAGS)" \
- -D ldflags="$(LDFLAGS)" \
- -D cf_email='$(email)' \
- -D d_berknames='define'
+ eval "$(dpkg-buildflags --export=sh)" && \
+ sh ./Configure \
+ -de \
+ -D prefix=$(PREFIX) \
+ -D orgname=/etc/news/organization \
+ -D myhostname=localhost \
+ -D mydomain=localdomain \
+ -D defeditor=/usr/ae \
+ -D usenm=no \
+ -D privlib=/usr/share/$(package) \
+ -D utmp="/var/run/utmp" \
+ -D optimize="$(CFLAGS)" \
+ -D ldflags="$(LDFLAGS)" \
+ -D cf_email='$(email)' \
+ -D d_berknames='define'
override_dh_auto_build: