* Patch by Yuli Barcohen, 19 Jul 2004:
  - Fix host tools building in Cygwin environment
  - Fix header files search order for host tools

* Patch by Tom Armistead, 19 Jul 2004:
  Fix kgdb.S support for 74xx_75x cpu
diff --git a/tools/Makefile b/tools/Makefile
index 9115430..d3dcc7d 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -96,12 +96,10 @@
 #
 ifeq ($(HOSTOS),cygwin)
 SFX = .exe
-HOST_CFLAGS += -D__WIN32__
 else
 SFX =
 endif
 
-
 #
 # Include this after HOSTOS HOSTARCH check
 # so that we can act intelligently.
@@ -111,7 +109,7 @@
 #
 # Use native tools and options
 #
-CPPFLAGS   = -I../include -I.. -DTEXT_BASE=$(TEXT_BASE) -DUSE_HOSTCC
+CPPFLAGS   = -idirafter ../include -DTEXT_BASE=$(TEXT_BASE) -DUSE_HOSTCC
 CFLAGS     = $(HOST_CFLAGS) $(CPPFLAGS) -O
 AFLAGS	   = -D__ASSEMBLY__ $(CPPFLAGS)
 CC	   = $(HOSTCC)