Module Name: src
Committed By: apb
Date: Mon Jan 20 10:57:38 UTC 2014
Modified Files:
src/gnu/usr.bin/gettext/libnlspr: Makefile
src/gnu/usr.bin/gettext/msginit: Makefile
Log Message:
Don't include ${DESTDIR} in -DLIBDIR=..., -DGETTEXTDATADIR=...,
and a few other variables.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/gnu/usr.bin/gettext/libnlspr/Makefile
cvs rdiff -u -r1.3 -r1.4 src/gnu/usr.bin/gettext/msginit/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/gnu/usr.bin/gettext/libnlspr/Makefile
diff -u src/gnu/usr.bin/gettext/libnlspr/Makefile:1.9 src/gnu/usr.bin/gettext/libnlspr/Makefile:1.10
--- src/gnu/usr.bin/gettext/libnlspr/Makefile:1.9 Thu May 26 12:56:28 2011
+++ src/gnu/usr.bin/gettext/libnlspr/Makefile Mon Jan 20 10:57:38 2014
@@ -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
Index: src/gnu/usr.bin/gettext/msginit/Makefile
diff -u src/gnu/usr.bin/gettext/msginit/Makefile:1.3 src/gnu/usr.bin/gettext/msginit/Makefile:1.4
--- src/gnu/usr.bin/gettext/msginit/Makefile:1.3 Fri Nov 10 17:36:08 2006
+++ src/gnu/usr.bin/gettext/msginit/Makefile Mon Jan 20 10:57:38 2014
@@ -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
