From 6e8413f4e1d6ee49be90b6970f34f4c5091d37ca Mon Sep 17 00:00:00 2001
From: Stas Degteff <stas_degteff@users.sourceforge.net>
Date: Tue, 26 Apr 2005 09:49:22 +0000
Subject: [PATCH] Change enviroment test order to prevent use DJGPP options in
 cygwin

---
 GNUmakef.def          | 24 ++++++++++++------------
 GNUmakef.inc          |  4 ++--
 goldlib/gall/Makefile |  4 ++--
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/GNUmakef.def b/GNUmakef.def
index caf9c4d..2489374 100644
--- a/GNUmakef.def
+++ b/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
diff --git a/GNUmakef.inc b/GNUmakef.inc
index b9596b7..a584f23 100644
--- a/GNUmakef.inc
+++ b/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,$<) &&	\
diff --git a/goldlib/gall/Makefile b/goldlib/gall/Makefile
index 1c655e1..5ac996d 100644
--- a/goldlib/gall/Makefile
+++ b/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