[libwpg] 03/05: use dh_auto_configure instead of manual ./configure

Rene Engelhard rene at moszumanska.debian.org
Tue Sep 13 02:55:13 UTC 2016


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

rene pushed a commit to branch master
in repository libwpg.

commit 90b765d770cd96678170d7ff13a5b3f1a736aa34
Author: Rene Engelhard <rene at rene-engelhard.de>
Date:   Mon Sep 12 23:27:33 2016 +0200

    use dh_auto_configure instead of manual ./configure
---
 debian/rules | 23 +++--------------------
 1 file changed, 3 insertions(+), 20 deletions(-)

diff --git a/debian/rules b/debian/rules
index 211cdbd..be166f6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,28 +9,11 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-CFLAGS = -Wall -g
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
-else
-	CFLAGS += -O2
-endif
-
 ifneq (,$(filter parallel=%,$(subst $(COMMA), ,$(DEB_BUILD_OPTIONS))))
   NJOBS := -j $(subst parallel=,,$(filter parallel=%,$(subst $(COMMA), ,$(DEB_BUILD_OPTIONS))))
 endif
 
-# shared library versions, option 1
-#version=2.0.5
-#major=2
-# option 2, assuming the library is created as src/.libs/libfoo.so.2.0.5 or so
-version=`ls src/.libs/lib*.so.* | \
- awk '{if (match($$0,/[0-9]+\.[0-9]+\.[0-9]+$$/)) print substr($$0,RSTART)}'`
-major=`ls src/.libs/lib*.so.* | \
- awk '{if (match($$0,/\.so\.[0-9]+$$/)) print substr($$0,RSTART+4)}'`
-
-CONFIGURE_FLAGS += --prefix=/usr --enable-static --disable-silent-rules
+CONFIGURE_FLAGS += --enable-static
 
 build: build-arch build-indep
 
@@ -39,7 +22,7 @@ build-arch-stamp:
 	dh_testdir
 
 	dh_autoreconf && \
-	./configure $(CONFIGURE_FLAGS) --without-docs
+	dh_auto_configure -- $(CONFIGURE_FLAGS) --without-docs
 	$(MAKE) $(NJOBS)
 ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
 	cd src/test; $(MAKE) check
@@ -55,7 +38,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 $(CONFIGURE_FLAGS)
+	dh_auto_configure -- $(CONFIGURE_FLAGS)
 	$(MAKE)
 
 	touch $@

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



More information about the Pkg-openoffice-commits mailing list