diff options
| author | Thomas Fitzsimmons <fitzsim@redhat.com> | 2006-06-15 23:08:48 +0000 |
|---|---|---|
| committer | Thomas Fitzsimmons <fitzsim@redhat.com> | 2006-06-15 23:08:48 +0000 |
| commit | 9acd59089d496ded7980c49ecc9b318aea30080b (patch) | |
| tree | 76f6811dc6a63494e5ebed9e36ac7180146e1310 /tools/toolwrapper.c | |
| parent | 0bd0c35629204cc3a55342d744b04a2635af951a (diff) | |
| download | classpath-9acd59089d496ded7980c49ecc9b318aea30080b.tar.gz | |
2006-06-15 Thomas Fitzsimmons <fitzsim@redhat.com>
* configure.ac: Rename appletviewer to gappletviewer, jarsigner to
gjarsigner and keytool to gkeytool.
* doc/tools.texinfo: Add note about tool exectable names.
* tools/Makefile.am: Rename appletviewer to gappletviewer,
jarsigner to gjarsigner and keytool to gkeytool.
* tools/appletviewer.in: Rename ...
* tools/gappletviewer.in: New file.
* tools/jarsigner.in: Rename ...
* tools/gjarsigner.in: New file.
* tools/keytool.in: Rename ...
* tools/gkeytool.in: New file.
* tools/toolwrapper.c: Simplify TOOLS_ZIP macro.
Diffstat (limited to 'tools/toolwrapper.c')
| -rw-r--r-- | tools/toolwrapper.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/toolwrapper.c b/tools/toolwrapper.c index de6556c63..9ad14ac6d 100644 --- a/tools/toolwrapper.c +++ b/tools/toolwrapper.c @@ -128,7 +128,7 @@ main (int argc, const char** argv) goto destroy; } - vm_args.options[vm_args.nOptions++].optionString = "-Djava.class.path=" DATA_DIR "/" PACKAGE "/tools.zip"; + vm_args.options[vm_args.nOptions++].optionString = "-Djava.class.path=" TOOLS_ZIP; } /* Terminate vm_args.options with a NULL element. */ @@ -188,7 +188,7 @@ main (int argc, const char** argv) (*env)->SetObjectArrayElement (env, args_array, i, str); } - class_id = (*env)->FindClass (env, "gnu/classpath/tools/" TOOLNAME "/Main"); + class_id = (*env)->FindClass (env, "gnu/classpath/tools/" TOOLPACKAGE "/Main"); if (class_id == NULL) { fprintf (stderr, TOOLNAME ": FindClass failed.\n"); |