From 474e625dfe1fb8e1ded60279107c85e7b4704abd Mon Sep 17 00:00:00 2001 From: sunghan Date: Tue, 29 Aug 2017 15:35:03 +0900 Subject: [PATCH] Deliver the EXTDIR definition for external folder path on Makefile The external and apps folder need to use the external folder path. --- apps/Directory.mk | 2 +- apps/Makefile | 4 ++-- os/Makefile.unix | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/apps/Directory.mk b/apps/Directory.mk index 3884d3d..3e2e08a 100644 --- a/apps/Directory.mk +++ b/apps/Directory.mk @@ -64,7 +64,7 @@ all: nothing define SDIR_template $(1)_$(2): - $(Q) $(MAKE) -C $(1) $(2) TOPDIR="$(TOPDIR)" APPDIR="$(APPDIR)" + $(Q) $(MAKE) -C $(1) $(2) TOPDIR="$(TOPDIR)" APPDIR="$(APPDIR)" EXTDIR="$(EXTDIR)" endef $(foreach SDIR, $(SUBDIRS), $(eval $(call SDIR_template,$(SDIR),preconfig))) diff --git a/apps/Makefile b/apps/Makefile index d27e417..8404d34 100644 --- a/apps/Makefile +++ b/apps/Makefile @@ -96,13 +96,13 @@ all: $(BIN) .PHONY: import install context context_serialize context_rest .depdirs preconfig depend clean distclean applist appupdate define MAKE_template - $(Q) $(MAKE) -C $(1) $(2) TOPDIR="$(TOPDIR)" APPDIR="$(APPDIR)" BIN_DIR="$(BIN_DIR)" + $(Q) $(MAKE) -C $(1) $(2) TOPDIR="$(TOPDIR)" APPDIR="$(APPDIR)" EXTDIR="$(EXTDIR)" BIN_DIR="$(BIN_DIR)" endef define SDIR_template $(1)_$(2): - $(Q) $(MAKE) -C $(1) $(2) TOPDIR="$(TOPDIR)" APPDIR="$(APPDIR)" BIN_DIR="$(BIN_DIR)" + $(Q) $(MAKE) -C $(1) $(2) TOPDIR="$(TOPDIR)" APPDIR="$(APPDIR)" EXTDIR="$(EXTDIR)" BIN_DIR="$(BIN_DIR)" endef diff --git a/os/Makefile.unix b/os/Makefile.unix index ad91c0e..c21b427 100644 --- a/os/Makefile.unix +++ b/os/Makefile.unix @@ -536,12 +536,12 @@ download: pass1dep: context tools/mkdeps$(HOSTEXEEXT) $(Q) for dir in $(USERDEPDIRS) ; do \ - $(MAKE) -C $$dir TOPDIR="$(TOPDIR)" depend ; \ + $(MAKE) -C $$dir TOPDIR="$(TOPDIR)" EXTDIR="$(EXTDIR)" depend ; \ done pass2dep: context tools/mkdeps$(HOSTEXEEXT) $(Q) for dir in $(KERNDEPDIRS) ; do \ - $(MAKE) -C $$dir TOPDIR="$(TOPDIR)" EXTRADEFINES=$(KDEFINE) depend; \ + $(MAKE) -C $$dir TOPDIR="$(TOPDIR)" EXTDIR="$(EXTDIR)" EXTRADEFINES=$(KDEFINE) depend; \ done # Configuration targets -- 2.7.4