diff --git a/ChangeLog b/ChangeLog index 49841600..89fb5fe5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2002-03-12 Richard Frith-Macdonald + + * fixpath.sh: Removed + * fixpath.sh.in: new file + * configure.in: generate fixpath.sh from fixpath.sh.in to control + whether it fixes cygwin or mingw/msys style paths. + 2002-03-11 Richard Frith-Macdonald * cygpath.sh: Removed ... replaced by fixpath.sh which should handle diff --git a/configure b/configure index a31e795b..b22ab8b4 100755 --- a/configure +++ b/configure @@ -1074,20 +1074,21 @@ fi echo "$ac_t""$ac_cv_cygwin" 1>&6 CYGWIN= test "$ac_cv_cygwin" = yes && CYGWIN=yes + echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6 -echo "configure:1079: checking for mingw32 environment" >&5 +echo "configure:1080: checking for mingw32 environment" >&5 if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1092: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_mingw32=yes else @@ -1106,7 +1107,7 @@ test "$ac_cv_mingw32" = yes && MINGW32=yes echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:1110: checking for executable suffix" >&5 +echo "configure:1111: checking for executable suffix" >&5 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1116,7 +1117,7 @@ else rm -f conftest* echo 'int main () { return 0; }' > conftest.$ac_ext ac_cv_exeext= - if { (eval echo configure:1120: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + if { (eval echo configure:1121: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then for file in conftest.*; do case $file in *.c | *.o | *.obj) ;; @@ -1137,13 +1138,13 @@ echo "$ac_t""${ac_cv_exeext}" 1>&6 ac_exeext=$EXEEXT echo $ac_n "checking for object suffix""... $ac_c" 1>&6 -echo "configure:1141: checking for object suffix" >&5 +echo "configure:1142: checking for object suffix" >&5 if eval "test \"`echo '$''{'ac_cv_objext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else rm -f conftest* echo 'int i = 1;' > conftest.$ac_ext -if { (eval echo configure:1147: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1148: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then for ac_file in conftest.*; do case $ac_file in *.c) ;; @@ -1185,7 +1186,7 @@ if test "x$target" != "x$host"; then # Extract the first word of ""${targetArgument}-gcc"", so it can be a program name with args. set dummy "${targetArgument}-gcc"; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1189: checking for $ac_word" >&5 +echo "configure:1190: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1215,7 +1216,7 @@ fi # Extract the first word of ""${targetArgument}-ranlib"", so it can be a program name with args. set dummy "${targetArgument}-ranlib"; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1219: checking for $ac_word" >&5 +echo "configure:1220: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1245,7 +1246,7 @@ fi # Extract the first word of ""${targetArgument}-ar"", so it can be a program name with args. set dummy "${targetArgument}-ar"; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1249: checking for $ac_word" >&5 +echo "configure:1250: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1275,7 +1276,7 @@ fi # Extract the first word of ""${targetArgument}-dlltool"", so it can be a program name with args. set dummy "${targetArgument}-dlltool"; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1279: checking for $ac_word" >&5 +echo "configure:1280: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1306,7 +1307,7 @@ else # Extract the first word of "ar", so it can be a program name with args. set dummy ar; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1310: checking for $ac_word" >&5 +echo "configure:1311: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1335,7 +1336,7 @@ fi # Extract the first word of "dlltool", so it can be a program name with args. set dummy dlltool; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1339: checking for $ac_word" >&5 +echo "configure:1340: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1364,7 +1365,7 @@ fi # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1368: checking for $ac_word" >&5 +echo "configure:1369: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1405,7 +1406,7 @@ fi # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:1409: checking for a BSD compatible install" >&5 +echo "configure:1410: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1458,7 +1459,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 -echo "configure:1462: checking whether ln -s works" >&5 +echo "configure:1463: checking whether ln -s works" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1484,7 +1485,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1488: checking for $ac_word" >&5 +echo "configure:1489: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_TAR'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1524,7 +1525,7 @@ fi # Extract the first word of "chown", so it can be a program name with args. set dummy chown; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1528: checking for $ac_word" >&5 +echo "configure:1529: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CHOWN'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1568,7 +1569,7 @@ fi # Also test for the C: directory, which means we're on Windows #-------------------------------------------------------------------- echo $ac_n "checking for GNUSTEP_SYSTEM_ROOT to use""... $ac_c" 1>&6 -echo "configure:1572: checking for GNUSTEP_SYSTEM_ROOT to use" >&5 +echo "configure:1573: checking for GNUSTEP_SYSTEM_ROOT to use" >&5 if test "x$prefix" = "xNONE"; then prefix="$ac_default_prefix" ; @@ -1615,7 +1616,7 @@ fi # --with-local-root and --with-network-root #-------------------------------------------------------------------- echo $ac_n "checking for GNUSTEP_LOCAL_ROOT to use""... $ac_c" 1>&6 -echo "configure:1619: checking for GNUSTEP_LOCAL_ROOT to use" >&5 +echo "configure:1620: checking for GNUSTEP_LOCAL_ROOT to use" >&5 # Check whether --with-local-root or --without-local-root was given. if test "${with_local_root+set}" = set; then withval="$with_local_root" @@ -1628,7 +1629,7 @@ fi echo "$ac_t""$GNUSTEP_LOCAL_ROOT" 1>&6 echo $ac_n "checking for GNUSTEP_NETWORK_ROOT to use""... $ac_c" 1>&6 -echo "configure:1632: checking for GNUSTEP_NETWORK_ROOT to use" >&5 +echo "configure:1633: checking for GNUSTEP_NETWORK_ROOT to use" >&5 # Check whether --with-network-root or --without-network-root was given. if test "${with_network_root+set}" = set; then withval="$with_network_root" @@ -1641,7 +1642,7 @@ fi echo "$ac_t""$GNUSTEP_NETWORK_ROOT" 1>&6 echo $ac_n "checking for GNUSTEP_USER_ROOT to be forced for all users""... $ac_c" 1>&6 -echo "configure:1645: checking for GNUSTEP_USER_ROOT to be forced for all users" >&5 +echo "configure:1646: checking for GNUSTEP_USER_ROOT to be forced for all users" >&5 # Check whether --with-user-root or --without-user-root was given. if test "${with_user_root+set}" = set; then withval="$with_user_root" @@ -1655,7 +1656,7 @@ echo "$ac_t""$FORCE_USER_ROOT" 1>&6 echo $ac_n "checking for GNUSTEP_DEFAULTS_ROOT to be forced for all users""... $ac_c" 1>&6 -echo "configure:1659: checking for GNUSTEP_DEFAULTS_ROOT to be forced for all users" >&5 +echo "configure:1660: checking for GNUSTEP_DEFAULTS_ROOT to be forced for all users" >&5 # Check whether --with-defaults-root or --without-defaults-root was given. if test "${with_defaults_root+set}" = set; then withval="$with_defaults_root" @@ -1742,7 +1743,7 @@ fi # If so, there are probably other libraries that we want there also, so # leave the proper includes in CPPFLAGS and LDFLAGS echo $ac_n "checking for shared objc library""... $ac_c" 1>&6 -echo "configure:1746: checking for shared objc library" >&5 +echo "configure:1747: checking for shared objc library" >&5 if eval "test \"`echo '$''{'gs_cv_objc_libdir'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1781,12 +1782,12 @@ for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr that defines DIR""... $ac_c" 1>&6 -echo "configure:1785: checking for $ac_hdr that defines DIR" >&5 +echo "configure:1786: checking for $ac_hdr that defines DIR" >&5 if eval "test \"`echo '$''{'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include <$ac_hdr> @@ -1794,7 +1795,7 @@ int main() { DIR *dirp = 0; ; return 0; } EOF -if { (eval echo configure:1798: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1799: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_header_dirent_$ac_safe=yes" else @@ -1819,7 +1820,7 @@ done # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix. if test $ac_header_dirent = dirent.h; then echo $ac_n "checking for opendir in -ldir""... $ac_c" 1>&6 -echo "configure:1823: checking for opendir in -ldir" >&5 +echo "configure:1824: checking for opendir in -ldir" >&5 ac_lib_var=`echo dir'_'opendir | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1827,7 +1828,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldir $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1843: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1860,7 +1861,7 @@ fi else echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6 -echo "configure:1864: checking for opendir in -lx" >&5 +echo "configure:1865: checking for opendir in -lx" >&5 ac_lib_var=`echo x'_'opendir | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1868,7 +1869,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lx $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1884: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1905,17 +1906,17 @@ for ac_hdr in sys/param.h sys/file.h dir.h string.h stdlib.h sys/types.h sys/s do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1909: checking for $ac_hdr" >&5 +echo "configure:1910: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1919: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1920: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -1944,12 +1945,12 @@ done for ac_func in getpwnam getpwuid geteuid getlogin do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:1948: checking for $ac_func" >&5 +echo "configure:1949: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1977: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2013,7 +2014,7 @@ fi echo $ac_n "checking whether objc has thread support""... $ac_c" 1>&6 -echo "configure:2017: checking whether objc has thread support" >&5 +echo "configure:2018: checking whether objc has thread support" >&5 extra_LIBS="" case "${target_os}" in solaris*) @@ -2032,11 +2033,11 @@ if test "$OBJC_THREAD" != ""; then objc_threaded="" else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2041: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then objc_threaded="$OBJC_THREAD $extra_LIBS" else @@ -2054,11 +2055,11 @@ elif test "$host_os" = linux-gnu; then objc_threaded="-lpthread" else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2063: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then objc_threaded="-lpthread" else @@ -2076,11 +2077,11 @@ elif test "`echo $host_os|sed 's/[0-9].*//'|sed s/elf//`" = freebsd; then objc_threaded="-pthread" else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2085: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then objc_threaded="-pthread" else @@ -2098,11 +2099,11 @@ fi objc_threaded="-lpthread" else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2107: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then objc_threaded="-lpthread" else @@ -2121,11 +2122,11 @@ fi objc_threaded="-lpcthread" else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2130: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then objc_threaded="-lpcthread" else @@ -2145,11 +2146,11 @@ elif test "$MINGW32" = yes; then objc_threaded="works" else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2154: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then objc_threaded="works" else @@ -2167,11 +2168,11 @@ else objc_threaded="" else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2176: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then objc_threaded="-lthread $extra_LIBS" else @@ -2203,7 +2204,7 @@ ac_cv_objc_threaded="$objc_threaded" #-------------------------------------------------------------------- echo $ac_n "checking if the compiler supports autodependencies""... $ac_c" 1>&6 -echo "configure:2207: checking if the compiler supports autodependencies" >&5 +echo "configure:2208: checking if the compiler supports autodependencies" >&5 # What we want to do: set AUTO_DEPENDENCIES to yes if gcc => 3.x @@ -2237,7 +2238,7 @@ fi # Enable/disable warnings for deprecated #import directive as required #--------------------------------------------------------------------- echo $ac_n "checking whether to disable compiler warnings about deprecated import""... $ac_c" 1>&6 -echo "configure:2241: checking whether to disable compiler warnings about deprecated import" >&5 +echo "configure:2242: checking whether to disable compiler warnings about deprecated import" >&5 # # GCC recommends that you use `--disable-import' here, since #import @@ -2263,7 +2264,7 @@ fi # Record the version #-------------------------------------------------------------------- echo $ac_n "checking for the version of gnustep-make we are compiling""... $ac_c" 1>&6 -echo "configure:2267: checking for the version of gnustep-make we are compiling" >&5 +echo "configure:2268: checking for the version of gnustep-make we are compiling" >&5 . "$srcdir/Version" echo "$ac_t""$GNUSTEP_MAKE_VERSION" 1>&6 @@ -2376,8 +2377,8 @@ ac_given_srcdir=$srcdir ac_given_INSTALL="$INSTALL" trap 'rm -fr `echo "config.h config.make openapp debugapp opentool -executable.template GNUmakefile GNUstep.sh GNUstep.csh gnustep-make.spec -Documentation/GNUmakefile config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 +executable.template GNUmakefile GNUstep.sh GNUstep.csh fixpath.sh \ +gnustep-make.spec Documentation/GNUmakefile config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 EOF cat >> $CONFIG_STATUS <> $CONFIG_STATUS <> $CONFIG_STATUS <<\EOF for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then @@ -2671,7 +2673,7 @@ cat >> $CONFIG_STATUS <> $CONFIG_STATUS <<\EOF chmod a+x openapp debugapp \ -opentool executable.template +opentool fixpath.sh executable.template exit 0 EOF chmod +x $CONFIG_STATUS diff --git a/configure.in b/configure.in index 8424e06b..ecf039c5 100644 --- a/configure.in +++ b/configure.in @@ -60,6 +60,7 @@ esac # Determine the host, build, and target systems #-------------------------------------------------------------------- AC_CYGWIN +AC_SUBST(CYGWIN) AC_MINGW32 AC_EXEEXT AC_OBJEXT @@ -468,6 +469,6 @@ AC_SUBST(GNUSTEP_MAKE_SUBMINOR_VERSION) # Produce the output files #-------------------------------------------------------------------- AC_OUTPUT(config.h config.make openapp debugapp opentool -executable.template GNUmakefile GNUstep.sh GNUstep.csh gnustep-make.spec -Documentation/GNUmakefile, chmod a+x openapp debugapp \ -opentool executable.template) +executable.template GNUmakefile GNUstep.sh GNUstep.csh fixpath.sh \ +gnustep-make.spec Documentation/GNUmakefile, chmod a+x openapp debugapp \ +opentool fixpath.sh executable.template) diff --git a/fixpath.sh b/fixpath.sh.in similarity index 95% rename from fixpath.sh rename to fixpath.sh.in index 7781a1d7..c6f534ec 100755 --- a/fixpath.sh +++ b/fixpath.sh.in @@ -44,7 +44,7 @@ if [ "$operation" = "-u" ]; then # # convert to Unix style file name # - if [ "$GNUSTEP_HOST_OS" = "cygwin" ]; then + if [ "@CYGWIN@" = "yes" ]; then # # drive:directory --> /cygdrive/drive/directory # @@ -64,7 +64,7 @@ else # # convert to Windows style file name # - if [ "$GNUSTEP_HOST_OS" = "cygwin" ]; then + if [ "@CYGWIN@" = "yes" ]; then # # /cygdrive/drive/directory --> drive:directory #