Makefile.am (AM_CXXFLAGS): Remove duplicate define.

2006-09-07  Matthias Klose  <doko@debian.org>

            * Makefile.am (AM_CXXFLAGS): Remove duplicate define.
            * Makefile.in: Regenerate.

From-SVN: r116750

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 57603f9ac91b9f5b55e24d3ae09f990dcf02de12..110104150dc9fbde9f6f140de8ca3d5629826419 100644 (file)
--- 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 25bfe6515e706583917fd58093535123019943ac..764cb96d8943bb5abac6ac3860ac7868e4b7c6a8 100644 (file)
--- 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 f4d37e91b7923b141b32aad867b6dbf7fc8d2982..cffe7262e447c9e4a872df2d1709fc8893a48aa7 100644 (file)
--- 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@ \