diff options
| author |   Masahiro Yamada <yamada.masahiro@socionext.com> | 2015-03-13 15:21:42 +0900 |
|---|---|---|
| committer |   Michal Marek <mmarek@suse.cz> | 2015-03-24 16:48:44 +0100 |
| commit | bc8f8f5fc47cd02c2c5f3580dac2fe6695af1edd (patch) | |
| tree | 4359f8f347e82f170a1bc7331e3bf40f0b0505c1 /scripts/kconfig/merge_config.sh | |
| parent | merge_config.sh: improve indentation (diff) | |
| download | linux-dev-bc8f8f5fc47cd02c2c5f3580dac2fe6695af1edd.tar.xz linux-dev-bc8f8f5fc47cd02c2c5f3580dac2fe6695af1edd.zip | |
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.
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>
Diffstat (limited to 'scripts/kconfig/merge_config.sh')
| -rwxr-xr-x | scripts/kconfig/merge_config.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/kconfig/merge_config.sh b/scripts/kconfig/merge_config.sh index 56584b107bf8..ec8e20350a64 100755 --- a/scripts/kconfig/merge_config.sh +++ b/scripts/kconfig/merge_config.sh @@ -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)" |