Update.

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

diff --git a/ChangeLog b/ChangeLog
index 2eb7fb3c0e1c552a42d332a0c9ada5adbe541ec8..b1cf455406b23f10ad0cf082731fcb9503afa126 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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.

diff --git a/catgets/Makefile b/catgets/Makefile
index 9ddc59dc7d1b7d2d5c2314921d0e3ec5e977a4c0..b4fbbf9b161a92b833b6c5e5435a027e4a4f566a 100644 (file)
--- a/catgets/Makefile
+++ b/catgets/Makefile
@@ -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
 

diff --git a/locale/Makefile b/locale/Makefile
index bc49c90636c46fa4a7a1fb61f2a9e21eb63ffb48..6ab6b54b7cbc5a528e1b0b839d054ab2717e777d 100644 (file)
--- a/locale/Makefile
+++ b/locale/Makefile
@@ -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