diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index ced1a4d5499c2dffa72abd36c4061c0f631ec618..00b2f6771e1b9fba5d6437b5602292af11e78a2b 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2004-05-24  Rainer Orth  <ro@TechFak.Uni-Bielefeld.DE>
+
+	* Makefile.in (CPPLIBS): Renamed to CPPLIB.
+	(BACKEND): Reflect this.
+	(LIBDEPS): Move CPPLIB before LIBIBERTY.
+	(LIBS): Likewise.
+
 2004-05-24  Ulrich Weigand  <uweigand@de.ibm.com>
 
 	PR tree-optimization/14197
diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index 641ce2f6068a35408076e5d20ab0bdb2c8183fdf..63552c5ff8c9b11de268e75bec1856dd4c51b560 100644
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -285,7 +285,7 @@ GMPINC = @GMPINC@
 BANSHEELIB = @BANSHEELIB@
 BANSHEEINC = @BANSHEEINC@
 
-CPPLIBS = ../libcpp/libcpp.a
+CPPLIB = ../libcpp/libcpp.a
 CPPINC = -I$(srcdir)/../libcpp/include
 
 # Substitution type for target's getgroups 2nd arg.
@@ -737,7 +737,7 @@ LIBIBERTY = ../libiberty/libiberty.a
 BUILD_LIBIBERTY = @FORBUILD@/libiberty/libiberty.a
 
 # Dependencies on the intl and portability libraries.
-LIBDEPS= $(LIBIBERTY) $(LIBINTL_DEP) $(LIBICONV_DEP) $(CPPLIB) $(BANSHEELIB)
+LIBDEPS= $(CPPLIB) $(LIBIBERTY) $(LIBINTL_DEP) $(LIBICONV_DEP) $(BANSHEELIB)
 
 # Likewise, for use in the tools that must run on this machine
 # even if we are cross-building GCC.
@@ -745,7 +745,7 @@ BUILD_LIBDEPS= $(BUILD_LIBIBERTY)
 
 # How to link with both our special library facilities
 # and the system's installed libraries.
-LIBS = @LIBS@ $(LIBIBERTY) $(LIBINTL) $(LIBICONV) $(CPPLIB)  $(BANSHEELIB)
+LIBS = @LIBS@ $(CPPLIB) $(LIBIBERTY) $(LIBINTL) $(LIBICONV) $(BANSHEELIB)
 
 # Any system libraries needed just for GNAT.
 SYSLIBS = @GNAT_LIBEXC@
@@ -911,7 +911,7 @@ OBJS = $(OBJS-common) $(out_object_file) $(OBJS-archive)
 
 OBJS-onestep = libbackend.o $(OBJS-archive)
 
-BACKEND = main.o @TREEBROWSER@ libbackend.a $(CPPLIBS)
+BACKEND = main.o @TREEBROWSER@ libbackend.a $(CPPLIB)
 
 # Files to be copied away after each stage in building.
 STAGESTUFF = *$(objext) insn-flags.h insn-config.h insn-codes.h \