[Pkg-wmaker-commits] [wmaker] 17/21: debian: Simplify debian/rules.
Doug Torrance
dtorrance-guest at moszumanska.debian.org
Fri Jan 8 01:40:38 UTC 2016
This is an automated email from the git hooks/post-receive script.
dtorrance-guest pushed a commit to branch next
in repository wmaker.
commit f7e1f5d5f4f2fe65b7ffb186b57f3a8e6fad6502
Author: Andreas Metzler <ametzler at bebt.de>
Date: Sun Dec 27 15:24:48 2015 +0100
debian: Simplify debian/rules.
Use dh_auto_configure, especially for handling dpkg-buildflags.
---
debian/changelog | 2 ++
debian/rules | 17 ++++-------------
2 files changed, 6 insertions(+), 13 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 089adaf..11c8a26 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -25,6 +25,8 @@ wmaker (0.95.7-1) unstable; urgency=medium
* 56_ignore_runstatedir.diff: Ignore missing documentation for --runstatedir
in INSTALL.
* Use dh_autoreconf instead of invoking autogen.sh in the configure target.
+ * Simplify debian/rules and use dh_auto_configure, especially for handling
+ dpkg-buildflags.
-- Rodolfo García Peñas (kix) <kix at debian.org> Thu, 13 Aug 2015 20:19:33 +0200
diff --git a/debian/rules b/debian/rules
index fda2056..684800e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,9 +1,6 @@
#!/usr/bin/make -f
# export DH_VERBOSE=1
-export CFLAGS = `dpkg-buildflags --get CFLAGS`
-export DEB_CFLAGS_MAINT_APPEND += -Wall -DGLOBAL_DEFAULTS_SUBDIR="\\\"GNUstep/Defaults\\\""
-export LDFLAGS = `dpkg-buildflags --get LDFLAGS`
-export CPPFLAGS = `dpkg-buildflags --get CPPFLAGS`
+export DEB_CFLAGS_MAINT_APPEND += -Wall -DGLOBAL_DEFAULTS_SUBDIR=\"GNUstep/Defaults\"
LINGUAS := $(patsubst po/%.po, %, $(wildcard po/*.po))
@@ -17,20 +14,14 @@ DEBIAN_TMP := debian/tmp
# Be careful with the leading / because some of these values are going
# to be hardcoded into the executables
BASEDIR := /usr
-CONFDIR := /etc
INCLUDEDIR := $(BASEDIR)/include
SHAREDIR := $(BASEDIR)/share
-MANDIR := $(SHAREDIR)/man
NLSDIR := $(SHAREDIR)/locale
GNUSTEPDIR := $(SHAREDIR)/lib/GNUstep/System
WMSHAREDIR := $(SHAREDIR)/WindowMaker
PIXMAPDIR := $(INCLUDEDIR)/X11/pixmaps
-COMMON_OPTIONS := --prefix=$(BASEDIR) \
- --mandir=$(MANDIR) \
- --includedir=$(INCLUDEDIR) \
- --sysconfdir=$(CONFDIR) \
- --datadir=$(SHAREDIR) \
+COMMON_OPTIONS := --datadir=$(SHAREDIR) \
--with-localedir=$(NLSDIR) \
--with-pixmapdir=$(PIXMAPDIR) \
--with-gnustepdir=$(GNUSTEPDIR)
@@ -39,8 +30,8 @@ COMMON_OPTIONS := --prefix=$(BASEDIR) \
dh $@ --parallel --with autoreconf
override_dh_auto_configure:
- LINGUAS="$(LINGUAS)" ./configure $(COMMON_OPTIONS) \
- $(WMAKER_OPTIONS) $(shell dpkg-buildflags --export=configure)
+ env LINGUAS="$(LINGUAS)" dh_auto_configure --verbose -- \
+ $(COMMON_OPTIONS) $(WMAKER_OPTIONS) --libdir=/usr/lib
override_dh_installmenu:
dh_installmenu -a --noscripts
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-wmaker/wmaker.git
More information about the Pkg-wmaker-commits
mailing list