procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

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

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

From-SVN: r115252
This commit is contained in:
Gary Benson 2006-07-07 10:02:59 +00:00 • committed by Gary Benson
parent 929e2b928c
commit 01ade80d07
3 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
libjava/ChangeLog
View file

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

2
libjava/Makefile.am
View file

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

2
libjava/Makefile.in
View file

@ -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)