[libwpd] 05/07: use dh_auto_configure instead of manual ./confgure

[Rene Engelhard]

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

rene pushed a commit to branch master
in repository libwpd.

commit 6e7145a2c254a9e45e32d708446b527af11200eb
Author: Rene Engelhard <rene at rene-engelhard.de>
Date:   Mon Sep 12 22:58:02 2016 +0200

    use dh_auto_configure instead of manual ./confgure
---
 debian/libwpd-0.10-10.dirs | 2 --
 debian/rules               | 7 +++----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/debian/libwpd-0.10-10.dirs b/debian/libwpd-0.10-10.dirs
deleted file mode 100644
index f5b3bee..0000000
--- a/debian/libwpd-0.10-10.dirs
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib
-
diff --git a/debian/rules b/debian/rules
index 83f5e1f..b07297c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -15,8 +15,7 @@ endif
 
 #DEBHELPER_OPTIONS = -N libwpd-tools
 
-CONFIGURE_FLAGS = --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info \
-        --disable-werror --enable-static --disable-silent-rules
+CONFIGURE_FLAGS = --disable-werror --enable-static --disable-silent-rules
 
 
 build: build-arch build-indep
@@ -26,7 +25,7 @@ build-arch-stamp:
 	dh_testdir
 
 	dh_autoreconf && \
-	./configure CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" CXXFLAGS="$(CXXFLAGS)" LDFLAGS="$(LDFLAGS)" $(CONFIGURE_FLAGS) --without-docs
+	dh_auto_configure -- $(CONFIGURE_FLAGS) --without-docs
 	$(MAKE) $(NJOBS)
 ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
 	cd src/test; $(MAKE) check
@@ -42,7 +41,7 @@ build-indep-stamp:
 	# completely. If we already ran build-arch (full build) this only
 	# builds the docs *in addition*
 	if [ ! -f debian/autoreconf.after ]; then dh_autoreconf; fi && \
-	./configure CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" CXXFLAGS="$(CXXFLAGS)" LDFLAGS="$(LDFLAGS)" $(CONFIGURE_FLAGS)
+	dh_auto_configure -- $(CONFIGURE_FLAGS)
 	$(MAKE)
 	
 	touch build-indep-stamp

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