merge_config.sh: rename MAKE to RUNMAKE
authorMasahiro Yamada <yamada.masahiro@socionext.com>
Fri, 13 Mar 2015 06:21:42 +0000 (15:21 +0900)
committerMichal Marek <mmarek@suse.cz>
Tue, 24 Mar 2015 15:48:44 +0000 (16:48 +0100)
The variable "MAKE" is used to store the command name that has
invoked the Makefile.  (Actually, it is already set to "make"
if you run this script from a Makefile.)

In this script, however, it is used to determine if Make should be
run or not.  It is not what we usually expect.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Reviewed-by: Josh Triplett <josh@joshtriplett.org>
Reviewed-by: Darren Hart <dvhart@linux.intel.com>
Signed-off-by: Michal Marek <mmarek@suse.cz>
scripts/kconfig/merge_config.sh

index 56584b1..ec8e203 100755 (executable)
@@ -35,7 +35,7 @@ usage() {
        echo "  -O    dir to put generated output files"
 }
 
-MAKE=true
+RUNMAKE=true
 ALLTARGET=alldefconfig
 WARNREDUN=false
 OUTPUT=.
@@ -48,7 +48,7 @@ while true; do
                continue
                ;;
        "-m")
-               MAKE=false
+               RUNMAKE=false
                shift
                continue
                ;;
@@ -119,7 +119,7 @@ for MERGE_FILE in $MERGE_LIST ; do
        cat $MERGE_FILE >> $TMP_FILE
 done
 
-if [ "$MAKE" = "false" ]; then
+if [ "$RUNMAKE" = "false" ]; then
        cp $TMP_FILE $OUTPUT/.config
        echo "#"
        echo "# merged configuration written to $OUTPUT/.config (needs make)"