From f162ad82fc34ca6fc0ca783f86525cecfaa9de8d Mon Sep 17 00:00:00 2001
From: Christopher Faylor <me@cgf.cx>
Date: Tue, 15 May 2001 05:11:55 +0000
Subject: [PATCH] * Makefile.common: Change method for finding current
 directory.

---
 winsup/ChangeLog       | 4 ++++
 winsup/Makefile.common | 8 +++++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/winsup/ChangeLog b/winsup/ChangeLog
index e2bac6e5d..caba4ed79 100644
--- a/winsup/ChangeLog
+++ b/winsup/ChangeLog
@@ -1,3 +1,7 @@
+Tue May 15 01:09:56 2001  Christopher Faylor <cgf@cygnus.com>
+
+	* Makefile.common: Change method for finding current directory.
+
 Sat May  5 00:14:03 2001  Christopher Faylor <cgf@cygnus.com>
 
 	* configure.in: Fix typo.
diff --git a/winsup/Makefile.common b/winsup/Makefile.common
index 1f2d04ca5..e9774ef98 100644
--- a/winsup/Makefile.common
+++ b/winsup/Makefile.common
@@ -28,7 +28,13 @@ endif
 endif
 
 pwd:=${shell pwd}
-here:=${word 1,${subst winsup/,winsup ,$(pwd)}}/cygwin
+ifneq "${filter winsup%,${notdir $(pwd)}}" ""
+a:=${shell ${filter winsup%,${notdir $(pwd)}} >/dev/tty}
+    here:=${pwd}/cygwin
+else
+a:=${shell ${filter winsup%,${notdir $(pwd)}} >/dev/tty}
+    here:=${dir $(pwd)}cygwin
+endif
 bupdir:=${shell cd $(here)/..; pwd}
 ifneq (,${filter-out /%,$(bupdir)})
     bupdir1:=../..