* Makefile.common: Resolve srcdir to absolute path or it will confuse usages
when passed to submakes. Eliminate vestigal use of MAKEOVERRIDES.
This commit is contained in:
parent
da7185af44
commit
ba87a619ef
|
@ -1,3 +1,9 @@
|
|||
Sun Apr 9 23:47:45 2000 Christopher Faylor <cgf@cygnus.com>
|
||||
|
||||
* Makefile.common: Resolve srcdir to absolute path or it will confuse
|
||||
usages when passed to submakes. Eliminate vestigal use of
|
||||
MAKEOVERRIDES.
|
||||
|
||||
Sun Apr 9 02:06:49 2000 Christopher Faylor <cgf@cygnus.com>
|
||||
|
||||
* Makefile.in: Work around MAKEOVERRIDES problem with older versions
|
||||
|
|
|
@ -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:
|
||||
|
||||
|
|
Loading…
Reference in New Issue