[proftpd-dfsg] 01/05: Revised for dh_auto* stuff

[Francesco Lovergine]

This is an automated email from the git hooks/post-receive script.

frankie pushed a commit to branch master
in repository proftpd-dfsg.

commit 05a5586c3a95982f8b365216307f6401cd5ba6ca
Author: Francesco Paolo Lovergine <frankie at debian.org>
Date:   Wed Jan 10 13:27:07 2018 +0100

    Revised for dh_auto* stuff
---
 debian/changelog           | 1 +
 debian/proftpd-dev.install | 4 ++--
 debian/rules               | 8 +++-----
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 433dd22..cbdfddf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -24,6 +24,7 @@ proftpd-dfsg (1.3.5e-1) unstable; urgency=medium
   * Removed obsolete code to manage migration from version 1.2.9 in preinst.
   * Fixed target in recent NEWS file issue to make lintian happy.
   * Fixed various spelling errors with new patch.
+  * Now correctly including dpkg buildflags makefile snippets.
 
  -- Francesco Paolo Lovergine <frankie at debian.org>  Wed, 10 Jan 2018 09:44:28 +0100
 
diff --git a/debian/proftpd-dev.install b/debian/proftpd-dev.install
index 0e27969..99d98fb 100644
--- a/debian/proftpd-dev.install
+++ b/debian/proftpd-dev.install
@@ -1,5 +1,5 @@
 usr/bin/prxs
 usr/lib/proftpd/*.a
 usr/include/proftpd/*
-usr/lib/pkgconfig/proftpd.pc usr/share/pkgconfig
-debian/proftpd-substvars usr/share/proftpd/
\ No newline at end of file
+usr/lib/*/pkgconfig/proftpd.pc usr/share/pkgconfig
+debian/proftpd-substvars usr/share/proftpd/
diff --git a/debian/rules b/debian/rules
index 6605ea1..ff0a57e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -32,6 +32,8 @@ ifeq (,$(DEB_BUILD_GNU_TYPE))
   include debian/scripts/dpkg-arch.mk
 endif
 
+include /usr/share/dpkg/buildflags.mk
+
 DSOMODS1 = mod_unique_id:mod_site_misc:mod_load:mod_ban:mod_quotatab:mod_sql:mod_sql_mysql:mod_sql_postgres:mod_sql_sqlite:mod_sql_odbc:mod_dynmasq:
 DSOMODS2 = mod_quotatab_sql:mod_ldap:mod_quotatab_ldap:mod_ratio:mod_tls:mod_rewrite:mod_radius:mod_wrap:mod_wrap2:mod_wrap2_file:
 DSOMODS3 = mod_wrap2_sql:mod_quotatab_file:mod_quotatab_radius:mod_facl:mod_ctrls_admin:mod_copy:mod_deflate:mod_ifversion:mod_tls_memcache:
@@ -68,8 +70,6 @@ install: build
 	dh_prep
 	
 	dh_auto_install
-	#$(MAKE) DESTDIR=$(CURDIR)/debian/tmp INSTALL_STRIP="$(INSTALL_STRIP)" install
-	#find $(CURDIR)/debian/tmp -type f \( -executable -o -name \*.so\* \) -exec hardening-check {} + || true
 
 configure: configure-stamp
 configure-stamp:
@@ -77,9 +77,7 @@ configure-stamp:
 	
 	# Use current autotools helpers
 	dh_update_autotools_config
-	
-	./configure $(shell dpkg-buildflags --export=configure) $(CONF_ARGS) --with-shared=$(DSOMODS1)$(DSOMODS2)$(DSOMODS3)$(DSOMODS4)
-	#dh_auto_configure -- $(CONF_ARGS) --with-shared=$(DSOMODS1)$(DSOMODS2)$(DSOMODS3)$(DSOMODS4)
+	dh_auto_configure -- $(CONF_ARGS) --with-shared=$(DSOMODS1)$(DSOMODS2)$(DSOMODS3)$(DSOMODS4)
 
 	touch $@
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-proftpd/proftpd-dfsg.git