This is the mail archive of the
java-patches@gcc.gnu.org
mailing list for the Java project.
Patch: FYI: disable some classpath tool install
- From: Tom Tromey <tromey at redhat dot com>
- To: GCJ-patches <java-patches at gcc dot gnu dot org>
- Date: 31 Jan 2007 15:16:09 -0700
- Subject: Patch: FYI: disable some classpath tool install
- Reply-to: tromey at redhat dot com
I'm checking this in.
We should not install classpath tools or the classpath tools.zip.
This may or may not be related to the problem that Andrew was seeing.
In any case it is best to be careful; relying on the libgcj install to
overwrite the classpath install is bad.
Tom
Index: ChangeLog.gcj
from Tom Tromey <tromey@redhat.com>
* tools/Makefile.in: Rebuilt.
* tools/Makefile.am (noinst_SCRIPTS): Renamed from bin_SCRIPTS.
(noinst_DATA): Renamed from TOOLS_DATA.
Index: tools/Makefile.am
===================================================================
--- tools/Makefile.am (revision 121440)
+++ tools/Makefile.am (working copy)
@@ -89,7 +89,8 @@
-DTOOLNAME="\"grmic\""
else
-bin_SCRIPTS = gappletviewer gjarsigner gkeytool \
+## GCJ LOCAL: do not install these.
+noinst_SCRIPTS = gappletviewer gjarsigner gkeytool \
gjar gnative2ascii gserialver gjavah grmiregistry \
gtnameserv gorbd grmid grmic
bin_PROGRAMS =
@@ -124,7 +125,8 @@
ALL_TOOLS_FILES = $(TOOLS_JAVA_FILES) $(RMIC_TEMPLATES)
# Some architecture independent data to be installed.
-TOOLS_DATA = $(TOOLS_ZIP)
+# GCJ LOCAL: do not install this.
+noinst_DATA = $(TOOLS_ZIP)
# Where we want these data files installed.
TOOLSdir = $(pkgdatadir)