diff options
| author | gary <gary@138bc75d-0d04-0410-961f-82ee72b054a4> | 2006-07-07 10:02:59 +0000 |
|---|---|---|
| committer | gary <gary@138bc75d-0d04-0410-961f-82ee72b054a4> | 2006-07-07 10:02:59 +0000 |
| commit | 1b262c0d3bf4b9c7baacd838f95a6dcd39faa135 (patch) | |
| tree | b1db3db5177e2fd3f70a3cffd48ec04d0953fa44 /libjava | |
| parent | 1f556a039bcfcfafe911d01517c8e3a2a134377c (diff) | |
| download | gcc-1b262c0d3bf4b9c7baacd838f95a6dcd39faa135.tar.gz | |
2006-07-07 Gary Benson <gbenson@redhat.com>
* Makefile.am (BOOT_CLASS_PATH_DIR): Only contain libgcj.jar.
* Makefile.in: Regenerate.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@115252 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 498d7c48847..725c5350249 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,8 @@ +2006-07-07 Gary Benson <gbenson@redhat.com> + + * Makefile.am (BOOT_CLASS_PATH_DIR): Only contain libgcj.jar. + * Makefile.in: Regenerate. + 2006-07-06 Bryce McKinlay <mckinlay@redhat.com> * stacktrace.cc (ClassForFrame): Remove commented-out code. diff --git a/libjava/Makefile.am b/libjava/Makefile.am index d14ef07686f..05be0fd4c99 100644 --- a/libjava/Makefile.am +++ b/libjava/Makefile.am @@ -53,7 +53,7 @@ JAVA_HOME_DIR = $(JAVA_HOME) BOOT_CLASS_PATH_DIR = $(JAVA_HOME)/lib/rt.jar else JAVA_HOME_DIR = $(prefix) -BOOT_CLASS_PATH_DIR = $(jardir)/$(jar_DATA) +BOOT_CLASS_PATH_DIR = $(jardir)/libgcj-$(gcc_version).jar endif ## FIXME: Using libdir violates GNU coding standards. diff --git a/libjava/Makefile.in b/libjava/Makefile.in index 58cdae28986..6b11b39a623 100644 --- a/libjava/Makefile.in +++ b/libjava/Makefile.in @@ -689,7 +689,7 @@ jardir = $(datadir)/java jar_DATA = libgcj-$(gcc_version).jar libgcj-tools-$(gcc_version).jar @JAVA_HOME_SET_FALSE@JAVA_HOME_DIR = $(prefix) @JAVA_HOME_SET_TRUE@JAVA_HOME_DIR = $(JAVA_HOME) -@JAVA_HOME_SET_FALSE@BOOT_CLASS_PATH_DIR = $(jardir)/$(jar_DATA) +@JAVA_HOME_SET_FALSE@BOOT_CLASS_PATH_DIR = $(jardir)/libgcj-$(gcc_version).jar @JAVA_HOME_SET_TRUE@BOOT_CLASS_PATH_DIR = $(JAVA_HOME)/lib/rt.jar secdir = $(libdir)/security propdir = $(libdir) |