1 files changed, 37 insertions, 34 deletions

diff --git a/libjava/classpath/tools/Makefile.am b/libjava/classpath/tools/Makefile.am
index 201939832..87ee030 100755
--- a/libjava/classpath/tools/Makefile.am
+++ b/libjava/classpath/tools/Makefile.am
@@ -23,7 +23,7 @@ endif
 
 if CREATE_WRAPPERS
 bin_SCRIPTS =
-bin_PROGRAMS = appletviewer jarsigner keytool
+bin_PROGRAMS = gappletviewer gjarsigner gkeytool
 
 if FOUND_GCJ
 LIBJVM = -lgcj
@@ -35,26 +35,40 @@ LIBJVM =
 endif
 endif
 
-appletviewer_SOURCES = toolwrapper.c
-appletviewer_CFLAGS = -Wall \
-	-DDATA_DIR="\"$(datadir)\"" \
-	-DPACKAGE="\"$(PACKAGE)\"" \
-	-DTOOLNAME="\"appletviewer\""
-appletviewer_LDFLAGS = -L$(libdir) $(LIBJVM)
-
-jarsigner_SOURCES = toolwrapper.c
-jarsigner_CFLAGS = -Wall \
-	-DDATA_DIR="\"$(datadir)\"" \
-	-DPACKAGE="\"$(PACKAGE)\"" \
-	-DTOOLNAME="\"jarsigner\""
-jarsigner_LDFLAGS = -L$(libdir) $(LIBJVM)
-
-keytool_SOURCES = toolwrapper.c
-keytool_CFLAGS = -Wall \
-	-DDATA_DIR="\"$(datadir)\"" \
-	-DPACKAGE="\"$(PACKAGE)\"" \
-	-DTOOLNAME="\"keytool\""
-keytool_LDFLAGS = -L$(libdir) $(LIBJVM)
+# Some architecture independent data to be installed.
+TOOLS_DATA = $(TOOLS_ZIP)
+
+# Where we want these data files installed.
+## GCJ LOCAL: install libgcj-tools.jar alongside libgcj.jar.
+TOOLSdir = $(datadir)/java
+
+# The zip files with classes we want to produce.
+## GCJ LOCAL: rename tools.zip libgcj-tools-$(gcc_version).jar
+TOOLS_ZIP = libgcj-tools-$(gcc_version).jar
+
+## GCJ LOCAL: calculate GCC version
+gcc_version := $(shell cat $(top_srcdir)/../../gcc/BASE-VER)
+
+gappletviewer_SOURCES = toolwrapper.c
+gappletviewer_CFLAGS = -Wall \
+	-DTOOLS_ZIP="\"$(TOOLSdir)/$(TOOLS_ZIP)\"" \
+	-DTOOLPACKAGE="\"appletviewer\"" \
+	-DTOOLNAME="\"gappletviewer\""
+gappletviewer_LDFLAGS = -L$(libdir) $(LIBJVM)
+
+gjarsigner_SOURCES = toolwrapper.c
+gjarsigner_CFLAGS = -Wall \
+	-DTOOLS_ZIP="\"$(TOOLSdir)/$(TOOLS_ZIP)\"" \
+	-DTOOLPACKAGE="\"jarsigner\"" \
+	-DTOOLNAME="\"gjarsigner\""
+gjarsigner_LDFLAGS = -L$(libdir) $(LIBJVM)
+
+gkeytool_SOURCES = toolwrapper.c
+gkeytool_CFLAGS = -Wall \
+	-DTOOLS_ZIP="\"$(TOOLSdir)/$(TOOLS_ZIP)\"" \
+	-DTOOLPACKAGE="\"keytool\"" \
+	-DTOOLNAME="\"gkeytool\""
+gkeytool_LDFLAGS = -L$(libdir) $(LIBJVM)
 
 else
 bin_SCRIPTS = appletviewer jarsigner keytool
@@ -65,10 +79,6 @@ EXTRA_DIST = toolwrapper.c appletviewer.in jarsigner.in keytool.in
 # All our example java source files
 TOOLS_JAVA_FILES = $(srcdir)/gnu/classpath/tools/*.java $(srcdir)/gnu/classpath/tools/*/*.java $(srcdir)/gnu/classpath/tools/*/*/*.java
 
-
-# The zip files with classes we want to produce.
-TOOLS_ZIP = tools.zip
-
 # Extra objects that will not exist until configure-time
 BUILT_SOURCES = $(TOOLS_ZIP)
 
@@ -88,13 +98,7 @@ TOOLS_HELPS = $(GIOP_HELPS) $(RMI_HELPS)
 READMES = $(srcdir)/gnu/classpath/tools/giop/README
 
 # All the files we find "interesting"
-ALL_TOOLS_FILES = $(TOOLS_JAVA_FILES) $(TOOLS_TEMPLATES) $(TOOLS_HELPS) $(READMES)
-
-# Some architecture independent data to be installed.
-TOOLS_DATA = $(TOOLS_ZIP) README
-
-# Where we want these data files installed.
-TOOLSdir = $(pkgdatadir)
+ALL_TOOLS_FILES = $(TOOLS_JAVA_FILES) $(TOOLS_TEMPLATES) $(TOOLS_HELPS)
 
 # Make sure everything is included in the distribution.
 dist-hook:
@@ -126,8 +130,7 @@ $(TOOLS_ZIP): $(TOOLS_JAVA_FILES)
 	cp $(GIOP_HELPS) classes/gnu/classpath/tools/giop/
 	$(JCOMPILER) -d classes $(TOOLS_JAVA_FILES)
 	(cd classes; \
-	if test "$(ZIP)" != ""; then $(ZIP) -r ../$(TOOLS_ZIP) .; fi; \
-	if test "$(FASTJAR)" != ""; then $(FASTJAR) cf ../$(TOOLS_ZIP) .; fi; \
+	$(FASTJAR) cf ../$(TOOLS_ZIP) .; \
 	cd ..)
 	rm -rf classes