History

merge_config.sh: rename MAKE to RUNMAKE

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.

Masahiro Yamada committed 11 years ago

Commit bc8f8f51 parent 3a975b81 file · +3 −3Browse files

Showing the changes to scripts (1 of 1 file). Show all

Unified · Split

scripts/kconfig/merge_config.sh+3−3
@@ -35,7 +35,7 @@ usage() { · 34 unmodified lines
3535 echo " -O dir to put generated output files"
3636 }
3737
38−MAKE=true
38+RUNMAKE=true
3939 ALLTARGET=alldefconfig
4040 WARNREDUN=false
4141 OUTPUT=.
@@ -48,7 +48,7 @@ while true; do · 6 unmodified lines
4848 continue
4949 ;;
5050 "-m")
51− MAKE=false
51+ RUNMAKE=false
5252 shift
5353 continue
5454 ;;
@@ -119,7 +119,7 @@ for MERGE_FILE in $MERGE_LIST ; do · 64 unmodified lines
119119 cat $MERGE_FILE >> $TMP_FILE
120120 done
121121
122−if [ "$MAKE" = "false" ]; then
122+if [ "$RUNMAKE" = "false" ]; then
123123 cp $TMP_FILE $OUTPUT/.config
124124 echo "#"
125125 echo "# merged configuration written to $OUTPUT/.config (needs make)"