2000-05-07  Ulrich Drepper  <drepper@redhat.com>

	* locale/Makefile (locale-CPPFLAGS): Renamed from CPPFLAGS.  It's
	only needed for locale.
	* catgets/Makefile (catgets-CPPFLAGS): Renamed from CPPFLAGS.
	It's only needed for catgets.
	Patches by Greg McGary <gkm@eng.ascend.com>.
This commit is contained in:
Ulrich Drepper 2000-05-08 05:02:46 +00:00
parent d1c2a14cdf
commit 33f5839ff3
3 changed files with 18 additions and 10 deletions

View File

@ -1,3 +1,11 @@
2000-05-07 Ulrich Drepper <drepper@redhat.com>
* locale/Makefile (locale-CPPFLAGS): Renamed from CPPFLAGS. It's
only needed for locale.
* catgets/Makefile (catgets-CPPFLAGS): Renamed from CPPFLAGS.
It's only needed for catgets.
Patches by Greg McGary <gkm@eng.ascend.com>.
2000-05-07 Mark Kettenis <kettenis@gnu.org>
* nss/nss_db/db-open.c: Cleanup and add comments. Pretty print.

View File

@ -1,4 +1,4 @@
# Copyright (C) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
# Copyright (C) 1996, 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
# This file is part of the GNU C Library.
# The GNU C Library is free software; you can redistribute it and/or
@ -38,8 +38,8 @@ include ../Rules
$(objpfx)gencat: $(gencat-modules:%=$(objpfx)%.o)
CPPFLAGS := -DNLSPATH='"$(msgcatdir)/%L/%N:$(msgcatdir)/%L/LC_MESSAGES/%N:$(msgcatdir)/%l/%N:$(msgcatdir)/%l/LC_MESSAGES/%N:"' \
-DHAVE_CONFIG_H $(CPPFLAGS)
catgets-CPPFLAGS := -DNLSPATH='"$(msgcatdir)/%L/%N:$(msgcatdir)/%L/LC_MESSAGES/%N:$(msgcatdir)/%l/%N:$(msgcatdir)/%l/LC_MESSAGES/%N:"' \
-DHAVE_CONFIG_H
generated = de.msg de.cat test1.cat test1.h

View File

@ -75,13 +75,13 @@ $(objpfx)localedef $(objpfx)locale: $(lib-modules:%=$(objpfx)%.o)
localepath = "$(localedir):$(i18ndir)"
CPPFLAGS := -DLOCALE_PATH='$(localepath)' \
-DLOCALEDIR='"$(localedir)"' \
-DLOCALE_ALIAS_PATH='"$(msgcatdir):$(i18ndir)"' \
-DCHARMAP_PATH='"$(i18ndir)/charmaps"' \
-DREPERTOIREMAP_PATH='"$(i18ndir)/repertoiremaps"' \
-DLOCSRCDIR='"$(i18ndir)/locales"' -DHAVE_CONFIG_H \
-Iprograms $(CPPFLAGS)
locale-CPPFLAGS := -DLOCALE_PATH='$(localepath)' \
-DLOCALEDIR='"$(localedir)"' \
-DLOCALE_ALIAS_PATH='"$(msgcatdir):$(i18ndir)"' \
-DCHARMAP_PATH='"$(i18ndir)/charmaps"' \
-DREPERTOIREMAP_PATH='"$(i18ndir)/repertoiremaps"' \
-DLOCSRCDIR='"$(i18ndir)/locales"' -DHAVE_CONFIG_H \
-Iprograms
CFLAGS-charmap.c = -Wno-write-strings -Wno-char-subscripts
CFLAGS-locfile.c = -Wno-write-strings -Wno-char-subscripts