* Makefile.in (cp-names-main.tab.o): Rename to test-cp-names.tab.o.
* config/djgpp/config.sed: Handle new *cp-names.tab.* references.
diff --git a/gdb/ChangeLog.cplus b/gdb/ChangeLog.cplus
index 9061b16..3909b1d 100644
--- a/gdb/ChangeLog.cplus
+++ b/gdb/ChangeLog.cplus
@@ -1,3 +1,8 @@
+2004-02-29 Daniel Jacobowitz <drow@mvista.com>
+
+ * Makefile.in (cp-names-main.tab.o): Rename to test-cp-names.tab.o.
+ * config/djgpp/config.sed: Handle new *cp-names.tab.* references.
+
2004-02-09 Daniel Jacobowitz <drow@mvista.com>
* config/djgpp/fnchange.lst: Add cp-names.tab.c.
diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index acaf7f5..32ec996 100644
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -1462,11 +1462,11 @@
cp-names.tab.o: cp-names.tab.c $(safe_ctype_h) $(libiberty_h) $(demangle_h)
-cp-names-main.tab.o: cp-names.tab.c $(safe_ctype_h) $(libiberty_h) $(demangle_h)
+test-cp-names.tab.o: cp-names.tab.c $(safe_ctype_h) $(libiberty_h) $(demangle_h)
$(CC) -c $(INTERNAL_CFLAGS) -DTEST_CPNAMES \
- -o cp-names-main.tab.o cp-names.tab.c
-test-cpnames: cp-names-main.tab.o $(LIBIBERTY)
- $(CC) -o test-cpnames cp-names-main.tab.o $(LIBIBERTY)
+ -o test-cp-names.tab.o cp-names.tab.c
+test-cpnames: test-cp-names.tab.o $(LIBIBERTY)
+ $(CC) -o test-cpnames test-cp-names.tab.o $(LIBIBERTY)
.PRECIOUS: cp-names.tab.c
cp-names.tab.c: cp-names.y
diff --git a/gdb/config/djgpp/config.sed b/gdb/config/djgpp/config.sed
index 4313bfb..2e9f0d0 100644
--- a/gdb/config/djgpp/config.sed
+++ b/gdb/config/djgpp/config.sed
@@ -5,7 +5,7 @@
/^ac_given_INSTALL=/,/^CEOF/ {
/^s%@prefix@%/a\
- s,\\([yp*]\\)\\.tab,\\1_tab,g\
+ s,\\([yps*]\\)\\.tab,\\1_tab,g\
/^ @rm -f/s,\\$@-\\[0-9\\]\\[0-9\\],& *.i[1-9] *.i[1-9][0-9],\
s,standards\\.info\\*,standard*.inf*,\
s,configure\\.info\\*,configur*.inf*,\
