pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/mk/tools MSGFMT_STRIP_* applies to both the native and...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/3c77bcef653b
branches:  trunk
changeset: 556381:3c77bcef653b
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Fri Mar 20 20:17:30 2009 +0000

description:
MSGFMT_STRIP_* applies to both the native and the pkgsrc version, so
move the conditional block into the shared path.

diffstat:

 mk/tools/gettext.mk |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (29 lines):

diff -r 6ba7a8cc19b3 -r 3c77bcef653b mk/tools/gettext.mk
--- a/mk/tools/gettext.mk       Fri Mar 20 20:10:15 2009 +0000
+++ b/mk/tools/gettext.mk       Fri Mar 20 20:17:30 2009 +0000
@@ -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 @@
        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=          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).



Home | Main Index | Thread Index | Old Index