diff --git a/winsup/ChangeLog b/winsup/ChangeLog
index e3f458a12..153d50ad5 100644
--- a/winsup/ChangeLog
+++ b/winsup/ChangeLog
@@ -1,3 +1,9 @@
+2006-07-23 Christopher Faylor <cgf@timesys.com>
+
+ * Makefile.in: Update copyright. Fix 'check' target so that it will
+ once-again create a working testsuite directory. Add a comment this
+ time to explain the unusual behavior.
+
2006-05-24 Christopher Faylor <cgf@timesys.com>
* configure.in: Update to newer autoconf.
@@ -53,7 +59,7 @@
gcc won't be able to find .exp files on other hosts.
2003-07-18 Vaclav Haisman <V.Haisman@sh.cvut.cz>
-
+
* Makefile.common (CFLAGS_COMMON): Remove -march=i386.
2003-07-01 Christopher Faylor <cgf@redhat.com>
diff --git a/winsup/Makefile.in b/winsup/Makefile.in
index 348b66a3a..61d49d5e3 100644
--- a/winsup/Makefile.in
+++ b/winsup/Makefile.in
@@ -1,5 +1,6 @@
# Makefile.in for windows stuff
-# Copyright 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 Red Hat, Inc.
+# Copyright 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2006
+# Red Hat, Inc.
#
# This file is part of Cygwin.
#
@@ -95,13 +96,17 @@ Makefile: Makefile.in $(srcdir)/configure.in config.status
config.status: configure
$(SHELL) config.status --recheck
+# The below rule is intended to run configure only when "make check" is
+# actually specified, i.e., not in a cross-compilation environment. The
+# cygwin configuration is copied and modified to ensure that the same configuration
+# parameters are passed when the testsuite is configured as when cygwin was configured.
check: cygwin
@if [ -f testsuite/config.status ]; then \
cd testsuite; \
else \
(mkdir testsuite 2>/dev/null || exit 0); \
cd testsuite; \
- sed -n -e '1,/^done/{' -e 's%winsup/cygwin\([ /]\)%winsup/testsuite\1%g; ' -e 'p; }' ../cygwin/config.status > config.status; \
+ sed -e 's%winsup/cygwin\>%winsup/testsuite%g' ../cygwin/config.status > config.status; \
chmod a+x config.status; \
sh ./config.status --recheck; \
sh ./config.status; \