Change enviroment test order to prevent use DJGPP options in cygwin

GNUmakef.def

@@ -8,6 +8,18 @@ MINGW=true
 endif
 endif
 
+ifdef MINGW
+CAT=cat
+CC=gcc -mno-cygwin
+CXX=g++ -mno-cygwin
+AR=ar
+RANLIB=ranlib
+WINDRES=windres
+PLATFORM=cyg
+EXEEXT=.exe
+OBJEXT=.o
+LIBEXT=.a
+else
 ifeq ($(findstring EMX, $(PATH)), EMX)
 CAT=cat
 CC=gcc
@@ -40,18 +52,6 @@ EXEEXT=.exe
 OBJEXT=.o
 LIBEXT=.a
 else
-ifdef MINGW
-CAT=cat
-CC=gcc -mno-cygwin
-CXX=g++ -mno-cygwin
-AR=ar
-RANLIB=ranlib
-WINDRES=windres
-PLATFORM=cyg
-EXEEXT=.exe
-OBJEXT=.o
-LIBEXT=.a
-else
 ifeq ($(OSTYPE),beos) # BeOS build
 CAT=cat
 CC=gcc

GNUmakef.inc

@@ -27,7 +27,7 @@ bld$(PLATFORM).inc: $(TARGET).all
 
 $(FOBJPATH)/%$(OBJEXT): %.cpp
 	@echo building $(basename $<)$(OBJEXT)
-	@$(CXX) -c -MD $(CPPFLAGS) -o $@ $<
+	$(CXX) -c -MD $(CPPFLAGS) -o $@ $<
 	@$(SHELL) -c "[ -s $(patsubst %.cpp,%.d,$<) ] &&					\
 		echo -n $(FOBJPATH)/>$(FDEPPATH)/$(patsubst %.cpp,%.d,$<) &&		\
 		$(CAT) $(patsubst %.cpp,%.d,$<)>>$(FDEPPATH)/$(patsubst %.cpp,%.d,$<) &&\
@@ -35,7 +35,7 @@ $(FOBJPATH)/%$(OBJEXT): %.cpp
 
 $(FOBJPATH)/%$(OBJEXT): %.c
 	@echo building $(basename $<)$(OBJEXT)
-	@$(CC) -c -MD $(CFLAGS) -o $@ $<
+	$(CC) -c -MD $(CFLAGS) -o $@ $<
 	@$(SHELL) -c "[ -s $(patsubst %.c,%.d,$<) ] &&					\
 		echo -n $(FOBJPATH)/>$(FDEPPATH)/$(patsubst %.c,%.d,$<) &&		\
 		$(CAT) $(patsubst %.c,%.d,$<)>>$(FDEPPATH)/$(patsubst %.c,%.d,$<) &&	\

goldlib/gall/Makefile

@@ -11,10 +11,10 @@ endif
 TOP=../..
 TARGET=gall
 INCS=-I$(TOP)/goldlib/gall
-ifeq ($(findstring EMX, $(PATH)), EMX)
+ifdef MINGW
 INCS+=-I$(TOP)/goldlib/glibc
 else
-ifdef MINGW
+ifeq ($(findstring EMX, $(PATH)), EMX)
 INCS+=-I$(TOP)/goldlib/glibc
 endif
 endif