diff options
| author | Sven Gothel <[email protected]> | 2012-06-25 22:09:00 +0200 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2012-06-25 22:09:00 +0200 |
| commit | 7a6e924be7190685650d87c680635d7fe53963fd (patch) | |
| tree | 29985e1e331f80d0d9e5670f4c4fcd80818572fa /make/scripts/setenv-jogl.sh | |
| parent | 2223a3242211e03bacfcb337d3f4e0e50533fb0e (diff) | |
Fix path derivation of J2RE_HOME and JAVA_HOME
Diffstat (limited to 'make/scripts/setenv-jogl.sh')
| -rwxr-xr-x | make/scripts/setenv-jogl.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/make/scripts/setenv-jogl.sh b/make/scripts/setenv-jogl.sh index 38fd8de38..2d91f278f 100755 --- a/make/scripts/setenv-jogl.sh +++ b/make/scripts/setenv-jogl.sh @@ -57,7 +57,7 @@ GLUEGEN_OS=$GLUEGEN_BUILDDIR/obj JUNIT_JAR=$GLUEGEN_DIR/make/lib/junit.jar if [ -z "$ANT_PATH" ] ; then - ANT_PATH=$(dirname `which ant`)/.. + ANT_PATH=$(dirname $(dirname $(which ant))) if [ -e $ANT_PATH/lib/ant.jar ] ; then export ANT_PATH echo autosetting ANT_PATH to $ANT_PATH @@ -76,8 +76,8 @@ echo JOGL BUILDDIR: $JOGL_BUILDDIR echo JOGL BUILDDIR BASE: $JOGL_BUILDDIR_BASE echo JOGL PROFILE: $JOGL_PROFILE -J2RE_HOME=$(which java) -JAVA_HOME=$(which javac) +J2RE_HOME=$(dirname $(dirname $(which java))) +JAVA_HOME=$(dirname $(dirname $(which javac))) CP_SEP=: . $JOGL_DIR/etc/profile.jogl $JOGL_PROFILE $JOGL_BUILDDIR |