Commit bc8f8f5f authored by Masahiro Yamada's avatar Masahiro Yamada Committed by Michal Marek

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: default avatarMasahiro Yamada <yamada.masahiro@socionext.com>
Reviewed-by: default avatarJosh Triplett <josh@joshtriplett.org>
Reviewed-by: default avatarDarren Hart <dvhart@linux.intel.com>
Signed-off-by: default avatarMichal Marek <mmarek@suse.cz>
parent 3a975b8c
...@@ -35,7 +35,7 @@ usage() { ...@@ -35,7 +35,7 @@ usage() {
echo " -O dir to put generated output files" echo " -O dir to put generated output files"
} }
MAKE=true RUNMAKE=true
ALLTARGET=alldefconfig ALLTARGET=alldefconfig
WARNREDUN=false WARNREDUN=false
OUTPUT=. OUTPUT=.
...@@ -48,7 +48,7 @@ while true; do ...@@ -48,7 +48,7 @@ while true; do
continue continue
;; ;;
"-m") "-m")
MAKE=false RUNMAKE=false
shift shift
continue continue
;; ;;
...@@ -119,7 +119,7 @@ for MERGE_FILE in $MERGE_LIST ; do ...@@ -119,7 +119,7 @@ for MERGE_FILE in $MERGE_LIST ; do
cat $MERGE_FILE >> $TMP_FILE cat $MERGE_FILE >> $TMP_FILE
done done
if [ "$MAKE" = "false" ]; then if [ "$RUNMAKE" = "false" ]; then
cp $TMP_FILE $OUTPUT/.config cp $TMP_FILE $OUTPUT/.config
echo "#" echo "#"
echo "# merged configuration written to $OUTPUT/.config (needs make)" echo "# merged configuration written to $OUTPUT/.config (needs make)"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment