FEX-Emu/linux
1
0
Fork 0
mirror of https://github.com/FEX-Emu/linux.git synced 2024-12-13 20:33:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

merge_config.sh: rename MAKE to RUNMAKE

Browse Source 
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>
This commit is contained in:
Masahiro Yamada 2015-03-13 15:21:42 +09:00 committed by Michal Marek
parent 3a975b8cfc
commit bc8f8f5fc4
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
scripts/kconfig/merge_config.sh
View File

@ -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
continue continue
;; ;;
"-m") "-m")
MAKE=false RUNMAKE=false
shift shift
continue continue
;; ;;
@ -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)"