summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
authorjoerg <joerg@pkgsrc.org>2009-03-20 20:17:30 +0000
committerjoerg <joerg@pkgsrc.org>2009-03-20 20:17:30 +0000
commit39ad89fe705094aceee54073f1cfdc7812cec87a (patch)
tree6134c742a7d214614e32b8ac69457af88f80958f /mk
parenta1a6399f39bc75fdef8274996958e4106cf79bf5 (diff)
downloadpkgsrc-39ad89fe705094aceee54073f1cfdc7812cec87a.tar.gz
MSGFMT_STRIP_* applies to both the native and the pkgsrc version, so
move the conditional block into the shared path.
Diffstat (limited to 'mk')
-rw-r--r--mk/tools/gettext.mk8
1 files changed, 4 insertions, 4 deletions
diff --git a/mk/tools/gettext.mk b/mk/tools/gettext.mk
index bdab8da7e96..34728385806 100644
--- a/mk/tools/gettext.mk
+++ b/mk/tools/gettext.mk
@@ -1,4 +1,4 @@
-# $NetBSD: gettext.mk,v 1.9 2009/03/20 16:13:02 joerg Exp $
+# $NetBSD: gettext.mk,v 1.10 2009/03/20 20:17:30 joerg Exp $
#
# Copyright (c) 2006 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -81,6 +81,9 @@ MSGFMT_STRIP_MSGID_PLURAL!= \
fi
. endif
. endif
+. else
+_TOOLS_USE_PKGSRC.msgfmt= yes
+. endif
MSGFMT_STRIP_MSGID_PLURAL?= no
MSGFMT_STRIP_MSGCTX?= no
.if ${MSGFMT_STRIP_MSGID_PLURAL} == "yes" || ${MSGFMT_STRIP_MSGCTX} == "yes"
@@ -89,9 +92,6 @@ _TOOLS_USE_MSGFMT_SH= yes
_TOOLS_USE_MSGFMT_SH= no
.endif
MAKEVARS+= _TOOLS_USE_MSGFMT_SH
-. else
-_TOOLS_USE_PKGSRC.msgfmt= yes
-. endif
# If we're not using the builtin gettext implementation, then we should
# definitely be using the pkgsrc version of msgfmt (gettext-tools).