Makefile.am (BOOT_CLASS_PATH_DIR): Only contain libgcj.jar.

2006-07-07  Gary Benson  <gbenson@redhat.com>

	* Makefile.am (BOOT_CLASS_PATH_DIR): Only contain libgcj.jar.
	* Makefile.in: Regenerate.

From-SVN: r115252

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 498d7c48847a4f4ef35fc08deae91448b3fdda22..725c53502498d70e0b4b3da56bb03ca585b8b729 100644 (file)
--- 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 d14ef07686fcbe7df8a5523643eaff470246d667..05be0fd4c996ee906cfdc5513f05b9f6c1b55f52 100644 (file)
--- 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 58cdae28986b9de0c2e645e5e6eeb2c2757d8ac3..6b11b39a623ac0337f0dc5b233db45c759435232 100644 (file)
--- 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)