From b13be6f6fb07be0120e0e3e8593ad2f9453a4764 Mon Sep 17 00:00:00 2001
From: Christopher Faylor <me@cgf.cx>
Date: Fri, 1 Sep 2000 14:20:30 +0000
Subject: [PATCH] * Makefile.in: More normalization.

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

diff --git a/winsup/ChangeLog b/winsup/ChangeLog
index e936aad60..3295a47b9 100644
--- a/winsup/ChangeLog
+++ b/winsup/ChangeLog
@@ -1,3 +1,7 @@
+Fri Sep  1 10:15:37 2000  Christopher Faylor <cgf@cygnus.com>
+
+	* Makefile.in: More normalization.
+
 Thu Aug 31 16:37:31 2000  Christopher Faylor <cgf@cygnus.com>
 
 	* Makefile.in: Normalize 'pwd' based on location of winsup.
diff --git a/winsup/Makefile.common b/winsup/Makefile.common
index be83ba41b..a6a200812 100644
--- a/winsup/Makefile.common
+++ b/winsup/Makefile.common
@@ -28,13 +28,12 @@ endif
 endif
 
 pwd:=${shell pwd}
-dummy_pwd:=${word 1,${subst winsup/,winsup ,$(pwd)}}/foo
-ifneq (,${filter-out /%,$(dummy_pwd)})
-    bupdir:=..
+here:=${word 1,${subst winsup/,winsup ,$(pwd)}}/cygwin
+bupdir:=${shell cd $(here)/..; pwd}
+ifneq (,${filter-out /%,$(bupdir)})
     bupdir1:=../..
     bupdir2:=../../..
 else
-    bupdir:=${patsubst %:::,%,${patsubst %/:::,%,$(dir $(dummy_pwd)):::}}
 ifneq (,${findstring /,$(bupdir)})
     bupdir1:=${patsubst %:::,%,${patsubst %/:::,%,$(dir $(bupdir)):::}}
 else