SimDist/build
diff -u -r1.17 -r1.18
--- common.gmk.in 15 Sep 2006 23:02:34 -0000 1.17
+++ common.gmk.in 23 May 2008 21:31:22 -0000 1.18
@@ -1,4 +1,4 @@
-# $Id: common.gmk.in,v 1.17 2006/09/15 23:02:34 jeremy Exp $
+# $Id: common.gmk.in,v 1.18 2008/05/23 21:31:22 jeremy Exp $
#
# Common Make variables for SimDist
@@ -23,9 +23,12 @@
# Make vars for programs
CVS=@CVS@
JAVA=@JAVA@
+JAVA_HOME=@JAVA_HOME@
+JDK_HOME=@JDK_HOME@
ANT=@ANT@
WGET=@WGET@
SCP=@SCP@
+CMAKE=@CMAKE@
# packages dep order
packages_dep_order=@packages_dep_order@
@@ -43,11 +46,6 @@
slic_run_script=slic.sh
slic_run=$(sim_scripts_dir)/$(slic_run_script)
-# Relative paths of files to include in binary distribution tarball.
-#bindist_files = $(sim_dist_dir_basename)/packages/xerces/@XERCES_VERSION@/lib/*
-#bindist_files += $(sim_dist_dir_basename)/packages/slic/@SLIC_VERSION@/bin/@G4SYSTEM@/@SLIC_BINNAME@
-#bindist_files += $(sim_dist_dir_basename)/scripts/slic.sh;:
-
# OpenGL
OGLHOME=@OGLHOME@
SimDist/build
diff -u -r1.11 -r1.12
--- util.m4 23 May 2008 21:01:25 -0000 1.11
+++ util.m4 23 May 2008 21:31:22 -0000 1.12
@@ -100,6 +100,23 @@
AC_SUBST(JAVA)
fi
+dnl setup local Java env vars
+AC_MSG_CHECKING(for JAVA_HOME)
+if test -z "$JAVA_HOME"
+then
+ JAVA_HOME=$(dirname `which java`)/..
+fi
+AC_MSG_RESULT($JAVA_HOME)
+AC_SUBST(JAVA_HOME)
+
+AC_MSG_CHECKING(for JDK_HOME)
+if test -z "$JDK_HOME"
+then
+ JDK_HOME=$JAVA_HOME
+fi
+AC_MSG_RESULT($JDK_HOME)
+AC_SUBST(JDK_HOME)
+
])
dnl ant
