diff options
| author | Matthias Klose <doko@debian.org> | 2007-03-05 19:37:50 +0000 |
|---|---|---|
| committer | Matthias Klose <doko@debian.org> | 2007-03-05 19:37:50 +0000 |
| commit | f01a4a912d31a273b06fe8e04da8d12eb41c9a23 (patch) | |
| tree | 902ac4ebd0cdeac6f4494eff91db52e76606357a /libjava | |
| parent | 95f933d1e6195ea5fc0cbc3ba52fe3a65325a660 (diff) | |
2007-03-05 Matthias Klose <doko@debian.org>
* Makefile.am (gij_LDFLAGS): Use dbexecdir.
* Makefile.in: Regnerate.
git-svn-id: https://gcc.gnu.org/svn/gcc/trunk@122564 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/ChangeLog | 5 | ||||
| -rw-r--r-- | libjava/Makefile.am | 2 | ||||
| -rw-r--r-- | 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 <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 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) |