diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 57603f9ac91..110104150dc 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+2006-09-07  Matthias Klose  <doko@debian.org>
+
+	* Makefile.am (AM_CXXFLAGS): Remove duplicate define.
+	* Makefile.in: Regenerate.
+
 2006-09-06  Keith Seitz  <keiths@redhat.com>
 
 	* java/lang/Class.h (_Jv_FindInterpreterMethod): Change return type
diff --git a/libjava/Makefile.am b/libjava/Makefile.am
index 25bfe6515e7..764cb96d894 100644
--- a/libjava/Makefile.am
+++ b/libjava/Makefile.am
@@ -127,8 +127,7 @@ AM_CXXFLAGS = \
 	-DGCJ_VERSIONED_LIBDIR="\"$(dbexecdir)\"" \
 	-DPATH_SEPARATOR="\"$(CLASSPATH_SEPARATOR)\"" \
 	-DLIBGCJ_DEFAULT_DATABASE="\"$(dbexecdir)/$(db_name)\"" \
-	-DLIBGCJ_DEFAULT_DATABASE_PATH_TAIL="\"$(db_pathtail)\"" \
-	-DTOOLEXECLIBDIR="\"$(toolexeclibdir)\""
+	-DLIBGCJ_DEFAULT_DATABASE_PATH_TAIL="\"$(db_pathtail)\""
 
 AM_GCJFLAGS = \
 	@LIBGCJ_JAVAFLAGS@ \
diff --git a/libjava/Makefile.in b/libjava/Makefile.in
index f4d37e91b79..cffe7262e44 100644
--- a/libjava/Makefile.in
+++ b/libjava/Makefile.in
@@ -753,8 +753,7 @@ AM_CXXFLAGS = \
 	-DGCJ_VERSIONED_LIBDIR="\"$(dbexecdir)\"" \
 	-DPATH_SEPARATOR="\"$(CLASSPATH_SEPARATOR)\"" \
 	-DLIBGCJ_DEFAULT_DATABASE="\"$(dbexecdir)/$(db_name)\"" \
-	-DLIBGCJ_DEFAULT_DATABASE_PATH_TAIL="\"$(db_pathtail)\"" \
-	-DTOOLEXECLIBDIR="\"$(toolexeclibdir)\""
+	-DLIBGCJ_DEFAULT_DATABASE_PATH_TAIL="\"$(db_pathtail)\""
 
 AM_GCJFLAGS = \
 	@LIBGCJ_JAVAFLAGS@ \