diff options
| -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 498d7c4..725c535 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 d14ef07..05be0fd 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 58cdae2..6b11b39 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) |