diff options
| author | UnicronNL <UnicronNL@users.noreply.github.com> | 2014-08-25 17:22:20 +0200 |
|---|---|---|
| committer | UnicronNL <UnicronNL@users.noreply.github.com> | 2014-08-25 17:22:20 +0200 |
| commit | 6d520b730fdcdeac98f83a270b6c9192ba1935fe (patch) | |
| tree | 0f12097f417de5ea61336a8ddf1fc4e34a6e4640 | |
| parent | 772bd9ce150862a7ad099d2ff16ed639b2aec1fe (diff) | |
| download | vyos-opennhrp-master.tar.gz vyos-opennhrp-master.zip | |
Rename build variable, was conflicting with Jenkinsmaster
| -rw-r--r-- | Make.rules | 16 |
1 files changed, 8 insertions, 8 deletions
@@ -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) @: |