# HG changeset patch
# User wenzelm
# Date 1271530915 -7200
# Node ID 8e61560ded89a682c8aaa25fc036bccca0dc0613
# Parent  067a01827fcab2a76da66f0f2c2e5c6dad157d5b
THIS_CYGWIN;

diff -r 067a01827fca -r 8e61560ded89 lib/scripts/getsettings
--- a/lib/scripts/getsettings	Sat Apr 17 20:42:26 2010 +0200
+++ b/lib/scripts/getsettings	Sat Apr 17 21:01:55 2010 +0200
@@ -53,7 +53,7 @@
 if [ "$OSTYPE" = cygwin ]; then
   CLASSPATH="$(cygpath -u -p "$CLASSPATH")"
   function jvmpath() { cygpath -w -p "$@"; }
-  CYGWIN_ROOT="$(jvmpath "/")"
+  THIS_CYGWIN="$(jvmpath "/")"
 else
   function jvmpath() { echo "$@"; }
 fi
diff -r 067a01827fca -r 8e61560ded89 src/Pure/System/cygwin.scala
--- a/src/Pure/System/cygwin.scala	Sat Apr 17 20:42:26 2010 +0200
+++ b/src/Pure/System/cygwin.scala	Sat Apr 17 21:01:55 2010 +0200
@@ -91,9 +91,9 @@
 
   def check_root(): String =
   {
-    val root_env = java.lang.System.getenv("CYGWIN_ROOT")
+    val this_cygwin = java.lang.System.getenv("THIS_CYGWIN")
     val root =
-      if (root_env != null && root_env != "") root_env
+      if (this_cygwin != null && this_cygwin != "") this_cygwin
       else
         query_registry(CYGWIN_SETUP1, "rootdir") orElse
         query_registry(CYGWIN_SETUP2, "rootdir") getOrElse