[src/trunk]: src/lib/libc Don't unconditionally pass MLIBDIR via CPPFLAGS. Dr...

[joerg <joerg%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/cd6eccb5cd7c
branches:  trunk
changeset: 340234:cd6eccb5cd7c
user:      joerg <joerg%NetBSD.org@localhost>
date:      Fri Aug 28 11:45:02 2015 +0000

description:
Don't unconditionally pass MLIBDIR via CPPFLAGS. Drop now dead branch.

diffstat:

 lib/libc/Makefile.inc           |  7 +++++--
 lib/libc/citrus/citrus_module.c |  6 +++---
 2 files changed, 8 insertions(+), 5 deletions(-)

diffs (48 lines):

diff -r 5acca7c6de51 -r cd6eccb5cd7c lib/libc/Makefile.inc
--- a/lib/libc/Makefile.inc     Fri Aug 28 11:38:57 2015 +0000
+++ b/lib/libc/Makefile.inc     Fri Aug 28 11:45:02 2015 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.inc,v 1.17 2014/12/10 00:37:30 pooka Exp $
+#      $NetBSD: Makefile.inc,v 1.18 2015/08/28 11:45:02 joerg Exp $
 #      @(#)Makefile    8.2 (Berkeley) 2/3/94
 #
 # All library objects contain sccsid strings by default; they may be
@@ -29,7 +29,10 @@
 
 WARNS=5
 CPPFLAGS+=     -D_LIBC -DLIBC_SCCS -DSYSLIBC_SCCS -D_REENTRANT
-CPPFLAGS+=     -D_DIAGNOSTIC -DMLIBDIR=\"${MLIBDIR}\"
+CPPFLAGS+=     -D_DIAGNOSTIC
+.if defined(MLIBDIR)
+CPPFLAGS+=     -DMLIBDIR=\"${MLIBDIR}\"
+.endif
 
 .if (${USE_HESIOD} != "no")
 CPPFLAGS+=     -DHESIOD
diff -r 5acca7c6de51 -r cd6eccb5cd7c lib/libc/citrus/citrus_module.c
--- a/lib/libc/citrus/citrus_module.c   Fri Aug 28 11:38:57 2015 +0000
+++ b/lib/libc/citrus/citrus_module.c   Fri Aug 28 11:45:02 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: citrus_module.c,v 1.11 2013/09/19 21:19:13 christos Exp $      */
+/*     $NetBSD: citrus_module.c,v 1.12 2015/08/28 11:45:02 joerg Exp $ */
 
 /*-
  * Copyright (c)1999, 2000, 2001, 2002 Citrus Project,
@@ -89,7 +89,7 @@
 
 #include <sys/cdefs.h>
 #if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: citrus_module.c,v 1.11 2013/09/19 21:19:13 christos Exp $");
+__RCSID("$NetBSD: citrus_module.c,v 1.12 2015/08/28 11:45:02 joerg Exp $");
 #endif /* LIBC_SCCS and not lint */
 
 #include <assert.h>
@@ -306,7 +306,7 @@
                        _pathI18nModule = _PATH_I18NMODULE;
 #ifdef MLIBDIR
                        p = strrchr(_pathI18nModule, '/');
-                       if (p != NULL && MLIBDIR[0]) {
+                       if (p != NULL) {
                                snprintf(path, sizeof(path), "%.*s/%s/%s",
                                    (int)(p - _pathI18nModule),
                                    _pathI18nModule, MLIBDIR, p + 1);