gryf/wmaker
1
0
Fork 0
mirror of https://github.com/gryf/wmaker.git synced 2025-12-19 20:38:08 +01:00
Code Issues Projects Releases Wiki Activity

debian: Simplify debian/rules.

Browse Source 
Use dh_auto_configure, especially for handling dpkg-buildflags.
This commit is contained in:
Andreas Metzler
2015-12-27 15:24:48 +01:00
committed by Carlos R. Mafra
parent 4660e5b1eb
commit f7e1f5d5f4
2 changed files with 6 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
debian/changelog vendored
View File

@@ -25,6 +25,8 @@ wmaker (0.95.7-1) unstable; urgency=medium
* 56_ignore_runstatedir.diff: Ignore missing documentation for --runstatedir * 56_ignore_runstatedir.diff: Ignore missing documentation for --runstatedir
in INSTALL. in INSTALL.
* Use dh_autoreconf instead of invoking autogen.sh in the configure target. * 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@debian.org> Thu, 13 Aug 2015 20:19:33 +0200 -- Rodolfo García Peñas (kix) <kix@debian.org> Thu, 13 Aug 2015 20:19:33 +0200

17
debian/rules vendored
View File

@@ -1,9 +1,6 @@
#!/usr/bin/make -f #!/usr/bin/make -f
# export DH_VERBOSE=1 # export DH_VERBOSE=1
export CFLAGS = `dpkg-buildflags --get CFLAGS` export DEB_CFLAGS_MAINT_APPEND += -Wall -DGLOBAL_DEFAULTS_SUBDIR=\"GNUstep/Defaults\"
export DEB_CFLAGS_MAINT_APPEND += -Wall -DGLOBAL_DEFAULTS_SUBDIR="\\\"GNUstep/Defaults\\\""
export LDFLAGS = `dpkg-buildflags --get LDFLAGS`
export CPPFLAGS = `dpkg-buildflags --get CPPFLAGS`
LINGUAS := $(patsubst po/%.po, %, $(wildcard po/*.po)) 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 # Be careful with the leading / because some of these values are going
# to be hardcoded into the executables # to be hardcoded into the executables
BASEDIR := /usr BASEDIR := /usr
CONFDIR := /etc
INCLUDEDIR := $(BASEDIR)/include INCLUDEDIR := $(BASEDIR)/include
SHAREDIR := $(BASEDIR)/share SHAREDIR := $(BASEDIR)/share
MANDIR := $(SHAREDIR)/man
NLSDIR := $(SHAREDIR)/locale NLSDIR := $(SHAREDIR)/locale
GNUSTEPDIR := $(SHAREDIR)/lib/GNUstep/System GNUSTEPDIR := $(SHAREDIR)/lib/GNUstep/System
WMSHAREDIR := $(SHAREDIR)/WindowMaker WMSHAREDIR := $(SHAREDIR)/WindowMaker
PIXMAPDIR := $(INCLUDEDIR)/X11/pixmaps PIXMAPDIR := $(INCLUDEDIR)/X11/pixmaps
COMMON_OPTIONS := --prefix=$(BASEDIR) \ COMMON_OPTIONS := --datadir=$(SHAREDIR) \
--mandir=$(MANDIR) \
--includedir=$(INCLUDEDIR) \
--sysconfdir=$(CONFDIR) \
--datadir=$(SHAREDIR) \
--with-localedir=$(NLSDIR) \ --with-localedir=$(NLSDIR) \
--with-pixmapdir=$(PIXMAPDIR) \ --with-pixmapdir=$(PIXMAPDIR) \
--with-gnustepdir=$(GNUSTEPDIR) --with-gnustepdir=$(GNUSTEPDIR)
@@ -39,8 +30,8 @@ COMMON_OPTIONS := --prefix=$(BASEDIR) \
dh $@ --parallel --with autoreconf dh $@ --parallel --with autoreconf
override_dh_auto_configure: override_dh_auto_configure:
LINGUAS="$(LINGUAS)" ./configure $(COMMON_OPTIONS) \ env LINGUAS="$(LINGUAS)" dh_auto_configure --verbose -- \
$(WMAKER_OPTIONS) $(shell dpkg-buildflags --export=configure) $(COMMON_OPTIONS) $(WMAKER_OPTIONS) --libdir=/usr/lib
override_dh_installmenu: override_dh_installmenu:
dh_installmenu -a --noscripts dh_installmenu -a --noscripts