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!

diff --git a/app-tools/Makefile b/app-tools/Makefile
index f240d8e8984a2dd34611b27758bc765c89059802..d656914ae512bfa3ff8b57299e28b14f43ee4bf4 100644 (file)
--- 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 811524db851da81c5c9719be6fb0cf670098359f..40a5fb3ca8d5ad53b4a287562125b85736af8745 100755 (executable)
--- 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}