aboutsummaryrefslogtreecommitdiff
path: root/winsup/Makefile.common
diff options
context:
space:
mode:
authorChristopher Faylor <me@cgf.cx>2000-04-10 03:51:39 +0000
committerChristopher Faylor <me@cgf.cx>2000-04-10 03:51:39 +0000
commitba87a619efd35c5e6655a3b3c3939340a22ddf94 (patch)
treedac58771334842f5333e629479bfa7e5fa1ab93d /winsup/Makefile.common
parentda7185af445fdfae7d2c500c832818dfb24dce2f (diff)
downloadnewlib-ba87a619efd35c5e6655a3b3c3939340a22ddf94.zip
newlib-ba87a619efd35c5e6655a3b3c3939340a22ddf94.tar.gz
newlib-ba87a619efd35c5e6655a3b3c3939340a22ddf94.tar.bz2
* Makefile.common: Resolve srcdir to absolute path or it will confuse usages
when passed to submakes. Eliminate vestigal use of MAKEOVERRIDES.
Diffstat (limited to 'winsup/Makefile.common')
-rw-r--r--winsup/Makefile.common9
1 files changed, 5 insertions, 4 deletions
diff --git a/winsup/Makefile.common b/winsup/Makefile.common
index 661a4d7..8075188 100644
--- a/winsup/Makefile.common
+++ b/winsup/Makefile.common
@@ -14,7 +14,8 @@ CFLAGS_COMMON:=-Wall -Wwrite-strings # -finline-functions
MALLOC_DEBUG:=#-DMALLOC_DEBUG -I/gotham/src/comp-tools/winsup/dlmalloc
MALLOC_OBJ:=#/gotham/src/comp-tools/winsup/dlmalloc/malloc.o
-ifeq (,${findstring /,$(srcdir)})
+override srcdir:=${shell cd $(srcdir); /bin/pwd}
+ifneq (,${filter-out /%,$(srcdir)})
updir:=$(srcdir)/..
updir1:=$(updir)/..
else
@@ -28,7 +29,7 @@ endif
pwd:=${shell pwd}
-ifeq (,${findstring /,$(pwd)})
+ifneq (,${filter-out /%,$(pwd)})
bupdir:=..
bupdir1:=../..
else
@@ -115,10 +116,10 @@ else
endif
$(bupdir1)/libiberty/%.o: $(updir1)/libiberty/%.c
- @$(MAKE) -C $(@D) $(MAKEOVERRIDES) $(@F)
+ @$(MAKE) -C $(@D) $(@F)
$(w32api_lib)/%.a: $(w32api_lib)/Makefile
- @$(MAKE) --no-print-dir -C $(@D) $(MAKEOVERRIDES) $(@F)
+ @$(MAKE) --no-print-dir -C $(@D) $(@F)
all: