summaryrefslogtreecommitdiff
path: root/src/compiler/scala/tools/ant/templates/generic-windows.tmpl
diff options
context:
space:
mode:
Diffstat (limited to 'src/compiler/scala/tools/ant/templates/generic-windows.tmpl')
-rw-r--r--src/compiler/scala/tools/ant/templates/generic-windows.tmpl6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/compiler/scala/tools/ant/templates/generic-windows.tmpl b/src/compiler/scala/tools/ant/templates/generic-windows.tmpl
index bea794a41a..a23422a7e4 100644
--- a/src/compiler/scala/tools/ant/templates/generic-windows.tmpl
+++ b/src/compiler/scala/tools/ant/templates/generic-windows.tmpl
@@ -14,7 +14,11 @@ rem - Local batch variables start with an underscore ('_')
if "%OS%"=="Windows_NT" (
@@setlocal
- set _SCALA_HOME=%~dps0..
+ set _BIN_DIR=
+ for %%i in (%~sf0) do set _BIN_DIR=%_BIN_DIR%%%~dpsi
+ set _SCALA_HOME=%_BIN_DIR%..
+ rem The following works on WinXP SP2 or newer (http://support.microsoft.com/?kbid=833431)
+ rem set _SCALA_HOME=%~dsp0..
) else (
set _SCALA_HOME=%SCALA_HOME%
if "%_SCALA_HOME%"=="" goto error1