Index: /trunk/src/VBox/Main/glue/tests/Makefile
===================================================================
--- /trunk/src/VBox/Main/glue/tests/Makefile	(revision 38914)
+++ /trunk/src/VBox/Main/glue/tests/Makefile	(revision 38915)
@@ -1,2 +1,5 @@
+## @file
+# Makefile for a sample/testcase using the 'glue' Java API bindings
+
 #
 # Copyright (C) 2010-2011 Oracle Corporation
@@ -11,9 +14,27 @@
 #
 
+#
+# User serviceable parts: adjust the following lines appropriately
+#
+
+# The host OS: linux, solaris, win, darwin, freebsd
 HOSTOS=linux
-VBOX_BIN = ../../../..
+# Absolute (!) path to the VirtualBox install directory
+VBOX_BIN = /opt/VirtualBox
+# Path to the sdk directory of the unpacked VirtualBox SDK
 VBOX_SDK = ../../..
+# On Windows, if you want to use the COM API: install directory of Jacob lib
 JACOB_DIR =
-CLASSPATH = .
+# Extra classpath entries needed for compiling/running the sample
+CLASSPATH =
+# Java compiler to use
+JAVAC = javac
+# Java VM to use
+JAVA = java
+
+
+# 
+# No changes should be necessary after this point.
+#
 
 ifeq ($(HOSTOS),win)
@@ -38,13 +59,13 @@
 com/TestVBox.class:
 	@mkdir com 2>/dev/null || true
-	javac -g -d com -cp $(VBOX_JAR)$(SEP)$(CLASSPATH) TestVBox.java
+	$(JAVAC) -d com -cp $(VBOX_JAR)$(SEP)$(CLASSPATH) TestVBox.java
 
 com/test-TestVBox: com/TestVBox.class
-	java $(JAVA_COM_ARGS) -cp com$(SEP)$(VBOX_JAR)$(SEP)$(CLASSPATH) TestVBox
+	$(JAVA) $(JAVA_COM_ARGS) -cp com$(SEP)$(VBOX_JAR)$(SEP)$(CLASSPATH) TestVBox
 
 ws/TestVBox.class:
 	@mkdir ws 2>/dev/null || true
-	javac -d ws -cp $(VBOX_JAR_WS)$(SEP)$(CLASSPATH) TestVBox.java
+	$(JAVAC) -d ws -cp $(VBOX_JAR_WS)$(SEP)$(CLASSPATH) TestVBox.java
 
 ws/test-TestVBox: ws/TestVBox.class
-	java $(JAVA_WS_ARGS) -cp ws$(SEP)$(VBOX_JAR_WS)$(SEP)$(CLASSPATH) TestVBox -w -url http://localhost:18083/
+	$(JAVA) $(JAVA_WS_ARGS) -cp ws$(SEP)$(VBOX_JAR_WS)$(SEP)$(CLASSPATH) TestVBox -w -url http://localhost:18083/