[Pkg-wmaker-commits] [wmaker] 05/10: debian/rules: Use new --with-defsdatadir configure option to specify global defaults directory instead of old GLOBAL_DEFAULTS_SUBDIR macro.

[Doug Torrance]

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

dtorrance-guest pushed a commit to branch experimental
in repository wmaker.

commit 411b5243e73fe186b599abc69824a79b89b5b854
Author: Doug Torrance <dtorrance at piedmont.edu>
Date:   Mon Mar 13 13:58:46 2017 -0400

    debian/rules: Use new --with-defsdatadir configure option to specify
    global defaults directory instead of old GLOBAL_DEFAULTS_SUBDIR macro.
---
 debian/rules | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/debian/rules b/debian/rules
index 0fa1168..f2c8b86 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,7 +2,7 @@
 # export DH_VERBOSE=1
 
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
-export DEB_CFLAGS_MAINT_APPEND += -Wall -DGLOBAL_DEFAULTS_SUBDIR=\"GNUstep/Defaults\"
+export DEB_CFLAGS_MAINT_APPEND += -Wall
 
 LINGUAS           := $(patsubst po/%.po, %, $(wildcard po/*.po))
 
@@ -22,11 +22,13 @@ NLSDIR            := $(SHAREDIR)/locale
 GNUSTEPDIR        := $(SHAREDIR)/lib/GNUstep/System
 WMSHAREDIR        := $(SHAREDIR)/WindowMaker
 PIXMAPDIR         := $(INCLUDEDIR)/X11/pixmaps
+DEFSDATADIR       := /etc/GNUstep/Defaults
 
 COMMON_OPTIONS    := --datadir=$(SHAREDIR)            \
                      --with-localedir=$(NLSDIR)       \
                      --with-pixmapdir=$(PIXMAPDIR)    \
-                     --with-gnustepdir=$(GNUSTEPDIR)
+                     --with-gnustepdir=$(GNUSTEPDIR)  \
+                     --with-defsdatadir=$(DEFSDATADIR)
 
 %:
 	dh $@ --parallel --with autoreconf

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