Better detection for Cygwin; thanks to Oscar Fuentes

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15854 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/distrib/msw/tmake/g95.t b/distrib/msw/tmake/g95.t
index f720c1d5ad98ab102624e984eb5fc58a22fc4a1d..ea576f935b7cf5f0a2557b3b291e134a3157ce12 100644 (file)
--- a/distrib/msw/tmake/g95.t
+++ b/distrib/msw/tmake/g95.t
@@ -318,20 +318,12 @@ ifeq ($(wxUSE_GUI),0)
   OBJECTS = $(MSWOBJS_BASE) $(COMMONOBJS_BASE) $(COMMONOBJS_BASEONLY) $(GENERICOBJS_BASE)
 endif
 
   OBJECTS = $(MSWOBJS_BASE) $(COMMONOBJS_BASE) $(COMMONOBJS_BASEONLY) $(GENERICOBJS_BASE)
 endif
 

-# MBN: if anyone has a better solution for this kludge, step
-#      forward, *please*
-# this tests is we are on cygwin or not ( will _not_ work if you are using
-# ZSH on plain Win32, tought ); it uses the presence of "/"
-# in the PATH variable
-

 # how do you do "VAR=\" ? BLEAGH!
 BACKSLASH=$(subst a,\,a)
 # how do you do "VAR=\" ? BLEAGH!
 BACKSLASH=$(subst a,\,a)

-ifeq (,$(findstring /,$(PATH)))
-  IS_CYGWIN=0
+ifeq (,$(findstring $(OSTYPE),"cygwin!msys"))

   PATH_SEPARATOR:=$(BACKSLASH)
   PATH_SUBST=/
 else
   PATH_SEPARATOR:=$(BACKSLASH)
   PATH_SUBST=/
 else

-  IS_CYGWIN=1

   PATH_SEPARATOR=/
   PATH_SUBST:=$(BACKSLASH)
 endif
   PATH_SEPARATOR=/
   PATH_SUBST:=$(BACKSLASH)
 endif