Makefile.am (gij_LDFLAGS): Use dbexecdir.

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

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

From-SVN: r122564

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 6de135a543edaf95f0160121b26efc6a6e7c5a02..14fafff1fc0979b56cc1e25f96be9c13e53f106e 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 3151444ccdfd3fd3df1f0f488d0a0f316dc8f314..42475b6a7c52a16a030c61e58d432aae701bb227 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 04d19c327adde237b8fb38f528cb5c6f9536b3f2..eca65f3b8da4c44122fb63d4862d24619448698e 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)