From 93a8e2e64be13737b9662747d3d5bf4405ec61cc Mon Sep 17 00:00:00 2001 From: Eric Andersen Date: Wed, 31 Jan 2001 01:38:05 +0000 Subject: Patch from Larry Doolittle to reduce the chance that fussing with VPATH will break cross-compilation. -Erik --- Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 4026d61c5..b0beb1dd2 100644 --- a/Makefile +++ b/Makefile @@ -153,10 +153,11 @@ else VPATH = .:$(BB_SRC_DIR) CONFIG_LIST = $(addsuffix /Config.h,$(subst :, ,$(VPATH))) CONFIG_H = $(word 1,$(shell ls -f -1 $(CONFIG_LIST) 2>/dev/null)) - CFLAGS += -I- $(patsubst %,-I%,$(subst :, ,$(VPATH))) $(CROSS_CFLAGS) + CFLAGS += -I- $(patsubst %,-I%,$(subst :, ,$(VPATH))) endif OBJECTS = $(shell $(BB_SRC_DIR)/busybox.sh $(CONFIG_H) $(BB_SRC_DIR)) busybox.o messages.o usage.o utility.o +CFLAGS += $(CROSS_CFLAGS) CFLAGS += -DBB_VER='"$(VERSION)"' CFLAGS += -DBB_BT='"$(BUILDTIME)"' ifdef BB_INIT_SCRIPT -- cgit v1.2.3