Module Name: src
Committed By: joerg
Date: Fri Aug 28 11:45:02 UTC 2015
Modified Files:
src/lib/libc: Makefile.inc
src/lib/libc/citrus: citrus_module.c
Log Message:
Don't unconditionally pass MLIBDIR via CPPFLAGS. Drop now dead branch.
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/lib/libc/Makefile.inc
cvs rdiff -u -r1.11 -r1.12 src/lib/libc/citrus/citrus_module.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/Makefile.inc
diff -u src/lib/libc/Makefile.inc:1.17 src/lib/libc/Makefile.inc:1.18
--- src/lib/libc/Makefile.inc:1.17 Wed Dec 10 00:37:30 2014
+++ src/lib/libc/Makefile.inc Fri Aug 28 11:45:02 2015
@@ -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 @@ RUMPRUN?= no
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
Index: src/lib/libc/citrus/citrus_module.c
diff -u src/lib/libc/citrus/citrus_module.c:1.11 src/lib/libc/citrus/citrus_module.c:1.12
--- src/lib/libc/citrus/citrus_module.c:1.11 Thu Sep 19 21:19:13 2013
+++ src/lib/libc/citrus/citrus_module.c Fri Aug 28 11:45:02 2015
@@ -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 @@ _citrus_load_module(_citrus_module_t *rh
_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);
