diff options
| author | Christopher Faylor <me@cgf.cx> | 2000-08-31 20:39:32 +0000 |
|---|---|---|
| committer | Christopher Faylor <me@cgf.cx> | 2000-08-31 20:39:32 +0000 |
| commit | dc941354a1cab91227c5c762beed52c61a165f9e (patch) | |
| tree | 783281088da58d5b45cc1f2a760d89e9f1abaf2e | |
| parent | 83a27d401a714aed642dc91f12ca7c11642a29a7 (diff) | |
| download | cygnal-dc941354a1cab91227c5c762beed52c61a165f9e.tar.gz cygnal-dc941354a1cab91227c5c762beed52c61a165f9e.tar.bz2 cygnal-dc941354a1cab91227c5c762beed52c61a165f9e.zip | |
* Makefile.in: Normalize 'pwd' based on location of winsup.
| -rw-r--r-- | winsup/ChangeLog | 4 | ||||
| -rw-r--r-- | winsup/Makefile.common | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/winsup/ChangeLog b/winsup/ChangeLog index 531027ac6..e936aad60 100644 --- a/winsup/ChangeLog +++ b/winsup/ChangeLog @@ -1,3 +1,7 @@ +Thu Aug 31 16:37:31 2000 Christopher Faylor <cgf@cygnus.com> + + * Makefile.in: Normalize 'pwd' based on location of winsup. + Thu Aug 24 15:02:26 2000 Christopher Faylor <cgf@cygnus.com> * Makefile.common: Add bupdir2 to reference above the i686-pc-cygwin diff --git a/winsup/Makefile.common b/winsup/Makefile.common index 550aaddfc..be83ba41b 100644 --- a/winsup/Makefile.common +++ b/winsup/Makefile.common @@ -28,12 +28,13 @@ endif endif pwd:=${shell pwd} -ifneq (,${filter-out /%,$(pwd)}) +dummy_pwd:=${word 1,${subst winsup/,winsup ,$(pwd)}}/foo +ifneq (,${filter-out /%,$(dummy_pwd)}) bupdir:=.. bupdir1:=../.. bupdir2:=../../.. else - bupdir:=${patsubst %:::,%,${patsubst %/:::,%,$(dir $(pwd)):::}} + bupdir:=${patsubst %:::,%,${patsubst %/:::,%,$(dir $(dummy_pwd)):::}} ifneq (,${findstring /,$(bupdir)}) bupdir1:=${patsubst %:::,%,${patsubst %/:::,%,$(dir $(bupdir)):::}} else |