* Makefile.in: Semi-revert 2006-08-30 change.

diff --git a/winsup/mingw/ChangeLog b/winsup/mingw/ChangeLog
index 2eedf3afedef1787c5cac9f371511984b5e48c2b..46b34a9ab8666a5dfa84d65e66a96c7cbfc21eb6 100644 (file)
--- 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 b2ec948efda119f643f00152d835dd7baa1f22cb..dbbfac9770cf8bdf66ac60f66d7dc65eb0c3660c 100644 (file)
--- 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.