Index: make/GNUstep.sh.in
===================================================================
RCS file: /cvsroot/gnustep/gnustep/core/make/GNUstep.sh.in,v
retrieving revision 1.50
diff -r1.50 GNUstep.sh.in
34a35,37
> GNUSTEP_MAKEFILES=$GNUSTEP_SYSTEM_ROOT/Makefiles
> export GNUSTEP_MAKEFILES
> 
37c40,70
< GNUSTEP_USER_ROOT=~/GNUstep
---
> 
> if [ ! -z "$WINDIR" ]; then
>   GNUSTEP_USER_ROOT=`echo $HOMEDRIVE/$HOMEPATH/GNUstep | tr '\\\' '/'`
> else
>   GNUSTEP_USER_ROOT=~/GNUstep
> fi
> 
> ac_save_ifs="$IFS"; IFS=":"
> 
> CYGPATH=
> ac_word=cygpath.exe
> ac_dummy="$PATH"
> for ac_dir in $ac_dummy; do
>   test -z "$ac_dir" && ac_dir=.
>   if test -f $ac_dir/$ac_word; then
>     CYGPATH=$ac_word
>     break
>   fi
> done
> 
> IFS="$ac_save_ifs"
> 
> if [ -z "$CYGPATH" ]; then
>   CYGPATH=$GNUSTEP_MAKEFILES/cygpath.sh
> fi
> 
> # test to see if GNUSTEP_ROOT is in Win32 standard form and flag it
> if [ -z "`echo $GNUSTEP_SYSTEM_ROOT | sed 's|^[a-zA-Z]:/.*$||'`" ]; then
>   CONVERT_WIN_PATHS=yes
> fi
> 
40,41d72
< GNUSTEP_MAKEFILES=$GNUSTEP_SYSTEM_ROOT/Makefiles
< export GNUSTEP_MAKEFILES
75c106,114
<   GNUSTEP_PATHPREFIX_LIST=$GNUSTEP_USER_ROOT:$GNUSTEP_LOCAL_ROOT:$GNUSTEP_NETWORK_ROOT:$GNUSTEP_SYSTEM_ROOT
---
>   if [ "$CONVERT_WIN_PATHS" = "yes" ]; then
>     G_U_R=`$CYGPATH -u "$GNUSTEP_USER_ROOT"`
>     G_L_R=`$CYGPATH -u "$GNUSTEP_LOCAL_ROOT"`
>     G_N_R=`$CYGPATH -u "$GNUSTEP_NETWORK_ROOT"`
>     G_S_R=`$CYGPATH -u "$GNUSTEP_SYSTEM_ROOT"`
>     GNUSTEP_PATHPREFIX_LIST=$G_U_R:$G_L_R:$G_N_R:$G_S_R
>   else
>     GNUSTEP_PATHPREFIX_LIST=$GNUSTEP_USER_ROOT:$GNUSTEP_LOCAL_ROOT:$GNUSTEP_NETWORK_ROOT:$GNUSTEP_SYSTEM_ROOT
>   fi
77a117
> 
103c143,147
< gnustep_class_path="$GNUSTEP_USER_ROOT/Libraries/Java:$GNUSTEP_LOCAL_ROOT/Libraries/Java:$GNUSTEP_NETWORK_ROOT/Libraries/Java:$GNUSTEP_SYSTEM_ROOT/Libraries/Java"
---
> if [ "$CONVERT_WIN_PATHS" = "yes" ]; then
>   gnustep_class_path="$G_U_R/Libraries/Java:$G_L_R/Libraries/Java:$G_N_R/Libraries/Java:$G_S_R/Libraries/Java"
> else
>   gnustep_class_path="$GNUSTEP_USER_ROOT/Libraries/Java:$GNUSTEP_LOCAL_ROOT/Libraries/Java:$GNUSTEP_NETWORK_ROOT/Libraries/Java:$GNUSTEP_SYSTEM_ROOT/Libraries/Java"
> fi