summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog8
-rw-r--r--catgets/Makefile6
-rw-r--r--locale/Makefile14
3 files changed, 18 insertions, 10 deletions
diff --git a/ChangeLog b/ChangeLog
index 2eb7fb3c0e..b1cf455406 100644
--- 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 9ddc59dc7d..b4fbbf9b16 100644
--- 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 bc49c90636..6ab6b54b7c 100644
--- 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