From 27cf2ad45c843c08c4cd180f69611744391b1734 Mon Sep 17 00:00:00 2001 From: UnicronNL Date: Mon, 25 Aug 2014 17:22:20 +0200 Subject: Rename build variable, was conflicting with Jenkins --- Make.rules | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Make.rules b/Make.rules index 5c30966..8565072 100644 --- a/Make.rules +++ b/Make.rules @@ -3,7 +3,7 @@ all: compile -ifndef build +ifndef srcbuild toplevelrun:=yes @@ -78,7 +78,7 @@ LDFLAGS_ALL += $(LDFLAGS) export CC LD INSTALL INSTALLDIR CFLAGS_ALL LDFLAGS_ALL -build := +srcbuild := endif @@ -91,15 +91,15 @@ endif src := obj := -src += $(build) -obj := $(build) +src += $(srcbuild) +obj := $(srcbuild) ## # Include directory specific stuff -ifneq ($(build),) -$(build)/Makefile: ; -include $(build)/Makefile +ifneq ($(srcbuild),) +$(srcbuild)/Makefile: ; +include $(srcbuild)/Makefile endif ## @@ -243,7 +243,7 @@ endif # Top level rules. %/: FORCE - $(Q)$(MAKE) -f Make.rules build=$(build-dir) $(MAKECMDGOALS) + $(Q)$(MAKE) -f Make.rules srcbuild=$(build-dir) $(MAKECMDGOALS) compile: $(targets) @: -- cgit v1.2.3