Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
joerg 2015-08-28 11:45:02 +00:00
parent 550539830b
commit e78620fb9b
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/libc/Makefile.inc
View File

@ -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

6
lib/libc/citrus/citrus_module.c
View File

@ -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 *rhandle, const char *encname)
_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);