aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Klose <doko@debian.org>2007-03-05 19:37:50 +0000
committerMatthias Klose <doko@gcc.gnu.org>2007-03-05 19:37:50 +0000
commit3b6d448dbcf715ed169f1d197a928d10e0fcd959 (patch)
tree902ac4ebd0cdeac6f4494eff91db52e76606357a
parent7343ff45caa89102f6d804cb1763276355e94443 (diff)
downloadgcc-3b6d448dbcf715ed169f1d197a928d10e0fcd959.zip
gcc-3b6d448dbcf715ed169f1d197a928d10e0fcd959.tar.gz
gcc-3b6d448dbcf715ed169f1d197a928d10e0fcd959.tar.bz2
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
-rw-r--r--libjava/ChangeLog5
-rw-r--r--libjava/Makefile.am2
-rw-r--r--libjava/Makefile.in2
3 files changed, 7 insertions, 2 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 6de135a..14fafff 100644
--- 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
--- 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
--- 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)