diff options
author | joerg <joerg> | 2009-03-20 20:17:30 +0000 |
---|---|---|
committer | joerg <joerg> | 2009-03-20 20:17:30 +0000 |
commit | 8ed110d8bd70d1761b128192d0d239de4ee9346f (patch) | |
tree | 6134c742a7d214614e32b8ac69457af88f80958f /mk | |
parent | e870925b1c1a463e0001fb1fa41931fdd4fef287 (diff) | |
download | pkgsrc-8ed110d8bd70d1761b128192d0d239de4ee9346f.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.mk | 8 |
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). |