From c48cea17a840fd9b3d3e5475223ad2babfa952d2 Mon Sep 17 00:00:00 2001
From: Christopher Faylor <me@cgf.cx>
Date: Mon, 11 Sep 2006 16:06:35 +0000
Subject: [PATCH] * Makefile.in: Semi-revert 2006-08-30 change.

---
 winsup/mingw/ChangeLog   | 4 ++++
 winsup/mingw/Makefile.in | 7 -------
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/winsup/mingw/ChangeLog b/winsup/mingw/ChangeLog
index 2eedf3afe..46b34a9ab 100644
--- a/winsup/mingw/ChangeLog
+++ b/winsup/mingw/ChangeLog
@@ -1,3 +1,7 @@
+2006-09-11  Christopher Faylor  <cgf@timesys.com>
+
+	* Makefile.in: Semi-revert 2006-08-30 change.
+
 2006-09-10  Danny Smith  <dannysmith@users.sourceforge.net>
 
 	* include/_mingw.h (__MINGW_ATTRIB_DEPRECATED): Define.
diff --git a/winsup/mingw/Makefile.in b/winsup/mingw/Makefile.in
index b2ec948ef..dbbfac977 100644
--- a/winsup/mingw/Makefile.in
+++ b/winsup/mingw/Makefile.in
@@ -54,18 +54,11 @@ inst_includedir:=$(tooldir)/include/mingw
 inst_libdir:=$(tooldir)/lib/mingw
 inst_docdir:=$(tooldir)/share/doc/mingw-runtime
 else
-ifneq (,$with_cross_host)
-inst_bindir:=$(tooldir)/bin
-inst_includedir:=$(tooldir)/include
-inst_libdir:=$(tooldir)/lib
-inst_docdir:=$(tooldir)/share/doc/mingw-runtime
-else
 inst_bindir:=$(bindir)
 inst_includedir:=$(includedir)
 inst_libdir:=$(libdir)
 inst_docdir:=$(prefix)/doc/mingw-runtime
 endif
-endif
 
 # The Mingw headers are installed under a subdirectory of
 # $(tooldir)/include when configuring in Cygwin.