Index: jamvm-1.5.0/configure.ac
===================================================================
--- jamvm-1.5.0.orig/configure.ac	2007-12-20 00:01:08.000000000 +0100
+++ jamvm-1.5.0/configure.ac	2007-12-20 00:03:40.000000000 +0100
@@ -22,7 +22,7 @@
 dnl Process this file with autoconf to produce a configure script.
 
 AC_INIT(src/jam.c)
-AM_INIT_AUTOMAKE(jamvm, 1.5.0)
+AM_INIT_AUTOMAKE(jamvm-initial, 1.5.0)
 AC_CONFIG_HEADERS([src/config.h])
 AC_PREFIX_DEFAULT(/usr/local/jamvm)
 
Index: jamvm-1.5.0/java-initial
===================================================================
--- /dev/null	1970-01-01 00:00:00.000000000 +0000
+++ jamvm-1.5.0/java-initial	2007-12-20 00:03:27.000000000 +0100
@@ -0,0 +1,5 @@
+#!/bin/sh
+#
+# Wrapper script inspired by the one provided by cacao.
+
+exec jamvm-initial ${1+"$@"}
Index: jamvm-1.5.0/lib/Makefile.am
===================================================================
--- jamvm-1.5.0.orig/lib/Makefile.am	2007-12-20 00:05:24.000000000 +0100
+++ jamvm-1.5.0/lib/Makefile.am	2007-12-20 00:05:28.000000000 +0100
@@ -19,7 +19,7 @@
 ## Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 ##
 
-CP_LIB_DIR = ${with_classpath_install_dir}/share/classpath
+CP_LIB_DIR = ${with_classpath_install_dir}/share/classpath-initial
 GLIBJ_ZIP  = ${CP_LIB_DIR}/glibj.zip
 
 SUBDIRS = jamvm java gnu sun
Index: jamvm-1.5.0/src/class.h
===================================================================
--- jamvm-1.5.0.orig/src/class.h	2007-12-20 00:06:34.000000000 +0100
+++ jamvm-1.5.0/src/class.h	2007-12-20 00:16:41.000000000 +0100
@@ -39,11 +39,11 @@
    separate class files in a directory structure */
 
 #ifdef USE_ZIP
-#define JAMVM_CLASSES INSTALL_DIR"/share/jamvm/classes.zip"
-#define CLASSPATH_CLASSES CLASSPATH_INSTALL_DIR"/share/classpath/glibj.zip"
+#define JAMVM_CLASSES CLASSPATH_INSTALL_DIR"/share/jamvm-initial/classes.zip"
+#define CLASSPATH_CLASSES CLASSPATH_INSTALL_DIR"/share/classpath-initial/glibj.zip"
 #else
-#define JAMVM_CLASSES INSTALL_DIR"/share/jamvm/classes"
-#define CLASSPATH_CLASSES CLASSPATH_INSTALL_DIR"/share/classpath"
+#define JAMVM_CLASSES CLASSPATH_INSTALL_DIR"/share/jamvm-initial/classes"
+#define CLASSPATH_CLASSES CLASSPATH_INSTALL_DIR"/share/classpath-initial"
 #endif
 
 #define DFLT_BCP JAMVM_CLASSES":"CLASSPATH_CLASSES
Index: jamvm-1.5.0/src/dll.c
===================================================================
--- jamvm-1.5.0.orig/src/dll.c	2007-12-20 00:01:24.000000000 +0100
+++ jamvm-1.5.0/src/dll.c	2007-12-20 00:03:27.000000000 +0100
@@ -294,7 +294,7 @@
 }
 
 char *getBootDllPath() {
-    return CLASSPATH_INSTALL_DIR"/lib/classpath";
+    return CLASSPATH_INSTALL_DIR"/lib/classpath-initial";
 }
 
 char *getDllName(char *name) {
Index: jamvm-1.5.0/src/Makefile.am
===================================================================
--- jamvm-1.5.0.orig/src/Makefile.am	2007-12-20 00:21:37.000000000 +0100
+++ jamvm-1.5.0/src/Makefile.am	2007-12-20 00:21:46.000000000 +0100
@@ -23,7 +23,7 @@
 DIST_SUBDIRS = os arch interp
 
 bin_PROGRAMS = jamvm
-include_HEADERS = jni.h
+noinst_HEADERS = jni.h
 
 lib_LTLIBRARIES = libjvm.la
 noinst_LTLIBRARIES = libcore.la