aboutsummaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorRob Landley <rob@landley.net>2013-07-25 22:41:26 -0500
committerRob Landley <rob@landley.net>2013-07-25 22:41:26 -0500
commit7c9d6ce182bf7e48484a1edbd59a6d416f6c5152 (patch)
tree71f803e4a6c521227ec7068f52b86933ffc0d459 /scripts
parenta6b99efdebc9df9d6b8b8ef3472fc2cb733d4694 (diff)
downloadtoybox-7c9d6ce182bf7e48484a1edbd59a6d416f6c5152.tar.gz
Juhani Haverinen pointed out that python 3 doesn't work with config2help.py, so you python2 binary until finishing the C rewrite.
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/make.sh7
1 files changed, 4 insertions, 3 deletions
diff --git a/scripts/make.sh b/scripts/make.sh
index 12a228eb..e2853bb3 100755
--- a/scripts/make.sh
+++ b/scripts/make.sh
@@ -134,11 +134,12 @@ GLOBSTRUCT="$(getglobals)"
) > 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":