merge with tot.
diff --git a/sim/ppc/ChangeLog b/sim/ppc/ChangeLog
index 6ced05b..4c2dfef 100644
--- a/sim/ppc/ChangeLog
+++ b/sim/ppc/ChangeLog
@@ -1,3 +1,10 @@
+2002-06-22 Andrew Cagney <ac131313@redhat.com>
+
+ * Makefile.in (INTL_SRC): Define.
+ (INTL_CFLAGS): Define.
+ (INTL_DIR): Define.
+ (STD_CFLAGS): Add INTL_CFLAGS.
+
2002-06-17 Elena Zannoni <ezannoni@redhat.com>
* psim.c (psim_options): Don't choke when gdb invokes us with
diff --git a/sim/ppc/Makefile.in b/sim/ppc/Makefile.in
index 6776992..d69b5c3 100644
--- a/sim/ppc/Makefile.in
+++ b/sim/ppc/Makefile.in
@@ -113,7 +113,7 @@
$(TERMIO_CFLAGS) \
$(DEVZERO_CFLAGS)
-STD_CFLAGS = $(CFLAGS) $(INLINE_CFLAGS) $(CONFIG_CFLAGS) $(WARNING_CFLAGS) $(SIM_CFLAGS) $(HDEFINES) $(TDEFINES) $(INCLUDES)
+STD_CFLAGS = $(CFLAGS) $(INLINE_CFLAGS) $(CONFIG_CFLAGS) $(WARNING_CFLAGS) $(SIM_CFLAGS) $(HDEFINES) $(TDEFINES) $(INCLUDES) $(INTL_CFLAGS)
NOWARN_CFLAGS = $(CFLAGS) $(INLINE_CFLAGS) $(CONFIG_CFLAGS) $(SIM_CFLAGS) $(HDEFINES) $(TDEFINES) $(INCLUDES)
BUILD_CFLAGS = -g -O $(INCLUDES) $(WARNING_CFLAGS)
@@ -154,6 +154,10 @@
INTLLIBS = @INTLLIBS@
INTLDEPS = @INTLDEPS@
+INTL_DIR = ../../intl
+INTL_SRC = $(srcdir)/$(INTL_DIR)
+INTL_CFLAGS = -I$(INTL_DIR) -I$(INTL_SRC)
+
TARGETLIB = libsim.a
