From 07e9f2131066fe29614ea8cf6e6d05d8fddecbb9 Mon Sep 17 00:00:00 2001
From: apb <apb@NetBSD.org>
Date: Mon, 20 Jan 2014 10:57:38 +0000
Subject: [PATCH] Don't include ${DESTDIR} in -DLIBDIR=...,
 -DGETTEXTDATADIR=..., and a few other variables.

---
 gnu/usr.bin/gettext/libnlspr/Makefile | 8 ++++----
 gnu/usr.bin/gettext/msginit/Makefile  | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/gnu/usr.bin/gettext/libnlspr/Makefile b/gnu/usr.bin/gettext/libnlspr/Makefile
index 28b9809248ba..0e2588b7af2c 100644
--- a/gnu/usr.bin/gettext/libnlspr/Makefile
+++ b/gnu/usr.bin/gettext/libnlspr/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.9 2011/05/26 12:56:28 joerg Exp $
+#	$NetBSD: Makefile,v 1.10 2014/01/20 10:57:38 apb Exp $
 
 LIBISPRIVATE=	yes
 
@@ -70,9 +70,9 @@ write-tcl.c
 .PATH:	${DIST}/gettext/gettext-tools/src ${DIST}/gettext/gettext-tools/lib
 CPPFLAGS+=-I${DIST}/gettext/gettext-runtime/intl
 CPPFLAGS+=-I${DIST}/gettext/gettext-tools/src
-CPPFLAGS+=-DLIBDIR=\"${DESTDIR}/usr/share\"
-CPPFLAGS+=-DGETTEXTJAR=\"${DESTDIR}/usr/share/gettext/gettext.jar\"
-CPPFLAGS+=-DGETTEXTDATADIR=\"${DESTDIR}/usr/share/gettext\"
+CPPFLAGS+=-DLIBDIR=\"/usr/share\"
+CPPFLAGS+=-DGETTEXTJAR=\"/usr/share/gettext/gettext.jar\"
+CPPFLAGS+=-DGETTEXTDATADIR=\"/usr/share/gettext\"
 
 COPTS.format-java.c = -Wno-stack-protector
 COPTS.msgl-cat.c = -Wno-stack-protector
diff --git a/gnu/usr.bin/gettext/msginit/Makefile b/gnu/usr.bin/gettext/msginit/Makefile
index 4c06c06ad166..eff2b4ffe973 100644
--- a/gnu/usr.bin/gettext/msginit/Makefile
+++ b/gnu/usr.bin/gettext/msginit/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.3 2006/11/10 17:36:08 christos Exp $
+#	$NetBSD: Makefile,v 1.4 2014/01/20 10:57:38 apb Exp $
 
 PROG=	msginit
 SRCS+=	msginit.c \
@@ -9,9 +9,9 @@ localename.c
 .include "${.CURDIR}/../Makefile.inc.prog"
 
 CPPFLAGS+=-I${DIST}/gettext/gettext-runtime/intl
-CPPFLAGS+=-DLIBDIR=\"${DESTDIR}/usr/share\" \
-    -DPROJECTSDIR=\"${DESTDIR}/usr/share\" \
-    -DLOCALE_ALIAS_PATH=\"${DESTDIR}/usr/share/locale\"
+CPPFLAGS+=-DLIBDIR=\"/usr/share\" \
+    -DPROJECTSDIR=\"/usr/share\" \
+    -DLOCALE_ALIAS_PATH=\"/usr/share/locale\"
 
 COPTS.msginit.c = -Wno-stack-protector
 COPTS.localealias.c = -Wno-stack-protector