--- a/domake	Thu Nov 25 19:21:22 2010 +0100
+++ b/domake	Fri Nov 26 12:12:35 2010 +0100
@@ -1,6 +1,7 @@
 #!/bin/bash
 
-test -n "$JRE7" || { echo "Need to set JRE7 environment variable to the base of a JRE 1.7"; exit 1; }
+test -n "$JDK7" || { echo "Need to set JDK7 environment variable to the base of a JDK 1.7"; exit 1; }
+test -n "$JDK7G" || { echo "Need to set JDK7G environment variable to the base of a JDK 1.7"; exit 1; }
 
 # Resolve location of this script
 me="${BASH_SOURCE[0]}"
@@ -9,9 +10,18 @@
 done
 graal_home=$(cd `dirname $me`; pwd)
 
-grep '-client KNOWN' $JRE7/lib/amd64/jvm.cfg >/dev/null
+grep '-client KNOWN' $JDK7/jre/lib/amd64/jvm.cfg >/dev/null
 if [ $? -ne 0 ] ; then
-    echo "The setting for -client in $JRE7/lib/amd64/jvm.cfg must be:"
+    echo "The setting for -client in $JDK7/jre/lib/amd64/jvm.cfg must be:"
+    echo
+    echo "  -client KNOWN"
+    echo
+    exit 1
+fi
+
+grep '-client KNOWN' $JDK7G/jre/lib/amd64/jvm.cfg >/dev/null
+if [ $? -ne 0 ] ; then
+    echo "The setting for -client in $JDK7G/jre/lib/amd64/jvm.cfg must be:"
     echo
     echo "  -client KNOWN"
     echo
@@ -20,14 +30,14 @@
 
 java_link="$graal_home/c1x4hotspotsrc/hotspot/java"
 if [ ! -e $java_link ]; then
-    echo "Creating link: $java_link -> $JRE7/bin/java"
-    ln -s $JRE7/bin/java $java_link
+    echo "Creating link: $java_link -> $JDK7/jre/bin/java"
+    ln -s $JDK7/jre/bin/java $java_link
 fi
 
 pushd $graal_home/make
-ALT_BOOTDIR=/usr/lib/jvm/java-6-openjdk/ LANG=C ARCH_DATA_MODEL=64 HOTSPOT_BUILD_JOBS=2 make jvmg1
-echo "Copying binaries to JRE7 directory $JRE7"
-cp ../build/linux/linux_amd64_compiler1/jvmg/libjvm.so $JRE7/lib/amd64/client
-cp ../build/linux/linux_amd64_compiler1/jvmg/libjsig.so $JRE7/lib/amd64/client
+
+ARCH_DATA_MODEL=64 LANG=C HOTSPOT_BUILD_JOBS=4 ALT_BOOTDIR=$JDK7G INSTALL=$JDK7G/jre make jvmg1
+ARCH_DATA_MODEL=64 LANG=C HOTSPOT_BUILD_JOBS=4 ALT_BOOTDIR=$JDK7 INSTALL=$JDK7/jre make product1
+
 popd