From 3b6d448dbcf715ed169f1d197a928d10e0fcd959 Mon Sep 17 00:00:00 2001 From: Matthias Klose Date: Mon, 5 Mar 2007 19:37:50 +0000 Subject: [PATCH] Makefile.am (gij_LDFLAGS): Use dbexecdir. 2007-03-05 Matthias Klose * Makefile.am (gij_LDFLAGS): Use dbexecdir. * Makefile.in: Regnerate. From-SVN: r122564 --- libjava/ChangeLog | 5 +++++ libjava/Makefile.am | 2 +- libjava/Makefile.in | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 6de135a543e..14fafff1fc0 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,8 @@ +2007-03-05 Matthias Klose + + * Makefile.am (gij_LDFLAGS): Use dbexecdir. + * Makefile.in: Regnerate. + 2007-03-05 Mark Wielaard * java/lang/Character.java: Re-merged with Classpath. diff --git a/libjava/Makefile.am b/libjava/Makefile.am index 3151444ccdf..42475b6a7c5 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 04d19c327ad..eca65f3b8da 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)