2007-03-05 Matthias Klose <doko@debian.org>

        * Makefile.am (gij_LDFLAGS): Use dbexecdir.
        * Makefile.in: Regnerate.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@122564 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 6de135a..14fafff 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+2007-03-05  Matthias Klose  <doko@debian.org>
+
+       * Makefile.am (gij_LDFLAGS): Use dbexecdir.
+       * Makefile.in: Regnerate.
+
 2007-03-05  Mark Wielaard  <mark@klomp.org>
 
        * java/lang/Character.java: Re-merged with Classpath.

diff --git a/libjava/Makefile.am b/libjava/Makefile.am
index 3151444..42475b6 100644 (file)
--- a/libjava/Makefile.am
+++ b/libjava/Makefile.am
@@ -666,7 +666,7 @@ gij_SOURCES =
 ## We need -nodefaultlibs because we want to avoid gcj's `-lgcj'.  We
 ## need this because we are explicitly using libtool to link using the
 ## `.la' file.
-gij_LDFLAGS = -rpath $(libdir)/gcj-$(gcc_version) -rpath $(toolexeclibdir) \
+gij_LDFLAGS = -rpath $(dbexecdir) -rpath $(toolexeclibdir) \
        -shared-libgcc $(THREADLDFLAGS)
 gij_LINK = $(GCJLINK)
 ## See jv_convert_LDADD.

diff --git a/libjava/Makefile.in b/libjava/Makefile.in
index 04d19c3..eca65f3 100644 (file)
--- a/libjava/Makefile.in
+++ b/libjava/Makefile.in
@@ -7830,7 +7830,7 @@ gc_analyze_LINK = $(GCJLINK)
 gc_analyze_LDADD = -L$(here)/.libs libgcj-tools.la libgcj.la
 gc_analyze_DEPENDENCIES = libgcj-tools.la libgcj.la libgcj.spec
 gij_SOURCES = 
-gij_LDFLAGS = -rpath $(libdir)/gcj-$(gcc_version) -rpath $(toolexeclibdir) \
+gij_LDFLAGS = -rpath $(dbexecdir) -rpath $(toolexeclibdir) \
        -shared-libgcc $(THREADLDFLAGS)
 
 gij_LINK = $(GCJLINK)