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

libjava/ChangeLog

+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.

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.

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)