[libwps] 04/07: use dh_auto_configure instead of manual ./configure
Rene Engelhard
rene at moszumanska.debian.org
Tue Sep 13 02:55:22 UTC 2016
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch master
in repository libwps.
commit 391aa97f9ee60ad8152b11860f945b6b3da598b5
Author: Rene Engelhard <rene at rene-engelhard.de>
Date: Mon Sep 12 23:15:36 2016 +0200
use dh_auto_configure instead of manual ./configure
---
debian/rules | 17 +++--------------
1 file changed, 3 insertions(+), 14 deletions(-)
diff --git a/debian/rules b/debian/rules
index afe08d7..6107c65 100755
--- a/debian/rules
+++ b/debian/rules
@@ -15,16 +15,7 @@ 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-werror --disable-silent-rules
+CONFIGURE_FLAGS += --enable-static --disable-werror
build: build-arch build-indep
@@ -34,8 +25,7 @@ build-arch-stamp:
dh_testdir
dh_autoreconf && \
- $(shell DEB_CFLAGS_MAINT_APPEND=-Wall dpkg-buildflags --export=cmdline) \
- ./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
@@ -51,8 +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 && \
- $(shell DEB_CFLAGS_MAINT_APPEND=-Wall dpkg-buildflags --export=cmdline) \
- ./configure $(CONFIGURE_FLAGS)
+ dh_auto_configure -- $(CONFIGURE_FLAGS)
$(MAKE)
clean:
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libwps.git
More information about the Pkg-openoffice-commits
mailing list