drew
/
acadia-newlib
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Makefile.common: Add bupdir2 to reference above the i686-pc-cygwin directory.

This commit is contained in:
Christopher Faylor 2000-08-24 19:05:38 +00:00
parent 0ad10c0f96
commit 5f3cb291b1
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
winsup/ChangeLog
View File

@ -1,3 +1,8 @@
Thu Aug 24 15:02:26 2000 Christopher Faylor <cgf@cygnus.com>
* Makefile.common: Add bupdir2 to reference above the i686-pc-cygwin
directory.
Thu Jun 22 18:28:06 2000 Christopher Faylor <cgf@cygnus.com> Thu Jun 22 18:28:06 2000 Christopher Faylor <cgf@cygnus.com>
* Makefile.in: Add dummy info targets. * Makefile.in: Add dummy info targets.

10
winsup/Makefile.common
View File

@ -11,8 +11,8 @@
# This makefile requires GNU make. # This makefile requires GNU make.
CFLAGS_COMMON:=-Wall -Wwrite-strings # -finline-functions CFLAGS_COMMON:=-Wall -Wwrite-strings # -finline-functions
MALLOC_DEBUG:=#-DMALLOC_DEBUG -I/cygnus/src/sourceware/winsup/dlmalloc MALLOC_DEBUG:=#-DMALLOC_DEBUG -I/cygnus/src/sourceware/winsup/cygwin/dlmalloc
MALLOC_OBJ:=#/cygnus/src/sourceware/winsup/dlmalloc/malloc.o MALLOC_OBJ:=#/cygnus/src/sourceware/winsup/cygwin/dlmalloc/malloc.o
override srcdir:=${shell cd $(srcdir); pwd} override srcdir:=${shell cd $(srcdir); pwd}
ifneq (,${filter-out /%,$(srcdir)}) ifneq (,${filter-out /%,$(srcdir)})
@ -31,6 +31,7 @@ pwd:=${shell pwd}
ifneq (,${filter-out /%,$(pwd)}) ifneq (,${filter-out /%,$(pwd)})
bupdir:=.. bupdir:=..
bupdir1:=../.. bupdir1:=../..
bupdir2:=../../..
else else
bupdir:=${patsubst %:::,%,${patsubst %/:::,%,$(dir $(pwd)):::}} bupdir:=${patsubst %:::,%,${patsubst %/:::,%,$(dir $(pwd)):::}}
ifneq (,${findstring /,$(bupdir)}) ifneq (,${findstring /,$(bupdir)})
@ -38,6 +39,11 @@ ifneq (,${findstring /,$(bupdir)})
else else
bupdir1:=$(bupdir)/.. bupdir1:=$(bupdir)/..
endif endif
ifneq (,${findstring /,$(bupdir1)})
bupdir2:=${patsubst %:::,%,${patsubst %/:::,%,$(dir $(bupdir1)):::}}
else
bupdir2:=$(bupdir1)/..
endif
endif endif
w32api_source:=$(updir)/w32api w32api_source:=$(updir)/w32api