Mercurial > hg > toybox
changeset 965:0d20619388b3
Juhani Haverinen pointed out that python 3 doesn't work with config2help.py, so you python2 binary until finishing the C rewrite.
author | Rob Landley <rob@landley.net> |
---|---|
date | Thu, 25 Jul 2013 22:41:26 -0500 |
parents | 9927d1d1e7e2 |
children | f1fef0c18d8c |
files | scripts/make.sh |
diffstat | 1 files changed, 4 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/scripts/make.sh Fri Jul 19 01:18:22 2013 +0200 +++ b/scripts/make.sh Thu Jul 25 22:41:26 2013 -0500 @@ -134,11 +134,12 @@ ) > generated/globals.h echo "generated/help.h" -# Only recreate generated/help.h if python is installed -if [ ! -z "$(which python)" ] && [ ! -z "$(grep 'CONFIG_TOYBOX_HELP=y' .config)" ] +# Only recreate generated/help.h if python2 is installed. Does not work with 3. +PYTHON="$(which python2)" +if [ ! -z "$PYTHON" ] && [ ! -z "$(grep 'CONFIG_TOYBOX_HELP=y' .config)" ] then echo "Extract help text from Config.in." - scripts/config2help.py Config.in > generated/help.h || exit 1 + "$PYTHON" scripts/config2help.py Config.in > generated/help.h || exit 1 fi # Extract a list of toys/*/*.c files to compile from the data in ".config":