From 0d6617f6c3af1fb1f8e7022169ecd0a826342047 Mon Sep 17 00:00:00 2001 From: Antti Kantee Date: Fri, 16 Oct 2015 02:10:06 +0000 Subject: [PATCH] CONFIG -> RUMPRUN_MKCONF If the name of the config file variable is not generic, devs can set it in the env for convenience. make it so! --- app-tools/Makefile | 8 ++++---- build-rr.sh | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app-tools/Makefile b/app-tools/Makefile index f240d8e..d656914 100644 --- a/app-tools/Makefile +++ b/app-tools/Makefile @@ -1,10 +1,10 @@ -ifeq ($(CONFIG),) -$(error CONFIG missing) +ifeq ($(RUMPRUN_MKCONF),) +$(error RUMPRUN_MKCONF missing) endif -include ${CONFIG} +include ${RUMPRUN_MKCONF} ifeq (${BUILDRUMP_TOOLFLAGS},) -$(error invalid config file ${CONFIG}) +$(error invalid config file ${RUMPRUN_MKCONF}) endif include ${BUILDRUMP_TOOLFLAGS} diff --git a/build-rr.sh b/build-rr.sh index 811524d..40a5fb3 100755 --- a/build-rr.sh +++ b/build-rr.sh @@ -316,7 +316,7 @@ EOF builduserspace () { - ${MAKE} -C app-tools CONFIG=$(pwd)/${PLATFORMDIR}/config.mk + ${MAKE} -C app-tools RUMPRUN_MKCONF=$(pwd)/${PLATFORMDIR}/config.mk usermtree ${STAGING} -- 2.39.5