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
35 echo " -O dir to put generated output files"35 echo " -O dir to put generated output files"
36}36}
37 37
38MAKE=true38RUNMAKE=true
39ALLTARGET=alldefconfig39ALLTARGET=alldefconfig
40WARNREDUN=false40WARNREDUN=false
41OUTPUT=.41OUTPUT=.
@@ -48,7 +48,7 @@ while true; do · 6 unmodified lines
48 continue48 continue
49 ;;49 ;;
50 "-m")50 "-m")
51 MAKE=false51 RUNMAKE=false
52 shift52 shift
53 continue53 continue
54 ;;54 ;;
@@ -119,7 +119,7 @@ for MERGE_FILE in $MERGE_LIST ; do · 64 unmodified lines
119 cat $MERGE_FILE >> $TMP_FILE119 cat $MERGE_FILE >> $TMP_FILE
120done120done
121 121
122if [ "$MAKE" = "false" ]; then122if [ "$RUNMAKE" = "false" ]; then
123 cp $TMP_FILE $OUTPUT/.config123 cp $TMP_FILE $OUTPUT/.config
124 echo "#"124 echo "#"
125 echo "# merged configuration written to $OUTPUT/.config (needs make)"125 echo "# merged configuration written to $OUTPUT/.config (needs make)"