* configure.ac (AC_CONFIG_FILES): Added src/scripts/rmic.

* src/scripts/Makefile.am (bin_SCRIPTS): Added rmic.
* src/scripts/java.in: Use ${1+"$@"} instead of $@.
* src/scripts/rmiregistry.in: Likewise.
* src/scripts/rmic.in: Updated to new rmic location.

diff --git a/configure.ac b/configure.ac
index 53dde69b4ce34d5bd50ec878f24ac2d45cf200af..851de84219fbdef3dc3062549be84c4252df8360 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -778,6 +778,7 @@ AC_CONFIG_FILES([Makefile]
                [src/native/vm/Makefile]
                [src/scripts/Makefile]
                [src/scripts/java]
+               [src/scripts/rmic]
                [src/scripts/rmiregistry]
                [src/threads/Makefile]
                [src/threads/green/Makefile]

diff --git a/src/scripts/Makefile.am b/src/scripts/Makefile.am
index 609137c89b9906145b71cd1939f1a760bd84e8ba..4d3a754fdebc563c653ffa1cb477e927c9a81595 100644 (file)
--- a/src/scripts/Makefile.am
+++ b/src/scripts/Makefile.am
@@ -28,14 +28,16 @@
 ##
 ## Changes:
 ##
-## $Id: Makefile.am 4357 2006-01-22 23:33:38Z twisti $
+## $Id: Makefile.am 4846 2006-04-26 09:02:39Z twisti $
 
 ## Process this file with automake to produce Makefile.in
 
 bin_SCRIPTS = \
        java \
+       rmic \
        rmiregistry
 
+
 ## Local variables:
 ## mode: Makefile
 ## indent-tabs-mode: t

diff --git a/src/scripts/java.in b/src/scripts/java.in
index b07d4683ed1f05816c911768eb312a47d293b475..cf73617e29804d4914e087a1cad3b651816eb95e 100644 (file)
--- a/src/scripts/java.in
+++ b/src/scripts/java.in
@@ -30,10 +30,10 @@
 ##
 ## Changes:
 ##
-## $Id: java.in 4357 2006-01-22 23:33:38Z twisti $
+## $Id: java.in 4846 2006-04-26 09:02:39Z twisti $
 
 prefix="@prefix@"
 exec_prefix="@exec_prefix@"
 bindir="@bindir@"
 
-exec ${bindir}/cacao $@
+exec ${bindir}/cacao ${1+"$@"}

diff --git a/src/scripts/rmic.in b/src/scripts/rmic.in
index 7d36999a1bf12435b4a06ddc11de3b6dd8eab21e..8f1fcbdf78d032a19d902aa2c41ef9ea9445dbd4 100644 (file)
--- a/src/scripts/rmic.in
+++ b/src/scripts/rmic.in
@@ -30,8 +30,11 @@
 ##
 ## Changes:
 ##
-## $Id: rmic.in 4357 2006-01-22 23:33:38Z twisti $
+## $Id: rmic.in 4846 2006-04-26 09:02:39Z twisti $
 
-prefix = @prefix@
+prefix="@prefix@"
+exec_prefix="@exec_prefix@"
+bindir="@bindir@"
+libdir="@CLASSPATH_PREFIX@/share/classpath"
 
-exec ${prefix}/jre/bin/cacao gnu.java.rmi.rmic.RMIC $@
+exec ${bindir}/cacao -cp ${libdir}/tools.zip gnu.classpath.tools.rmi.RMIC ${1+"$@"}

diff --git a/src/scripts/rmiregistry.in b/src/scripts/rmiregistry.in
index 45f7f3db1c8c2c9b61d08108aa1e560208836ee0..f1bbf289f3d4895e92b201072a67f99dc207883c 100644 (file)
--- a/src/scripts/rmiregistry.in
+++ b/src/scripts/rmiregistry.in
@@ -30,10 +30,10 @@
 ##
 ## Changes:
 ##
-## $Id: rmiregistry.in 4357 2006-01-22 23:33:38Z twisti $
+## $Id: rmiregistry.in 4846 2006-04-26 09:02:39Z twisti $
 
 prefix="@prefix@"
 exec_prefix="@exec_prefix@"
 bindir="@bindir@"
 
-exec ${bindir}/cacao gnu.java.rmi.registry.RegistryImpl $@
+exec ${bindir}/cacao gnu.java.rmi.registry.RegistryImpl ${1+"$@"}