mirror of
https://github.com/gryf/wmaker.git
synced 2025-12-19 12:28:22 +01:00
debian: Simplify debian/rules.
Use dh_auto_configure, especially for handling dpkg-buildflags.
This commit is contained in:
committed by
Carlos R. Mafra
parent
4660e5b1eb
commit
f7e1f5d5f4
2
debian/changelog
vendored
2
debian/changelog
vendored
@@ -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@debian.org> Thu, 13 Aug 2015 20:19:33 +0200
|
||||
|
||||
|
||||
17
debian/rules
vendored
17
debian/rules
vendored
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user