Changeset 1cef55f

Timestamp:

2015-06-04T17:13:22Z (10 years ago)

Author:

dequis <dx@…>

Branches:

master

Children:

3a27896

Parents:

fd45e859

git-author:

dequis <dx@…> (01-06-15 01:00:28)

git-committer:

dequis <dx@…> (04-06-15 17:13:22)

Message:

configure: allow specifying location of python executable

Because openbsd/netbsd don't have a 'python' in the PATH unless the user
creates the symlink explicitly.

Files:

• configure (modified) (1 diff)
• doc/user-guide/Makefile (modified) (2 diffs)
• doc/user-guide/genhelp.py (modified) (1 diff)

configure

@@ -685 +685 @@
 fi
 
+if [ -z "$PYTHON" ]; then
+        PYTHON=python
+fi
+
 if [ "$doc" = "1" ]; then
         # check this here just in case someone tries to install it in python2.4...
-        if ! python -m xml.etree.ElementTree > /dev/null 2>&1; then
+        if ! $PYTHON -m xml.etree.ElementTree > /dev/null 2>&1; then
                 echo
                 echo 'ERROR: Python (>=2.5 or 3.x) is required to generate docs'
+                echo "(Use the PYTHON environment variable if it's in a weird location)"
                 exit 1
         fi
         echo "DOC=1" >> Makefile.settings
+        echo "PYTHON=$PYTHON" >> Makefile.settings
 fi
 

doc/user-guide/Makefile

@@ -3 +3 @@
 _SRCDIR_ := $(_SRCDIR_)doc/user-guide/
 endif
+
+ifndef PYTHON
+PYTHON = python
+endif 
 
 all: help.txt
@@ -32 +36 @@
 
 help.txt: $(_SRCDIR_)help.xml $(_SRCDIR_)commands.xml $(_SRCDIR_)misc.xml $(_SRCDIR_)quickstart.xml
-        python $(_SRCDIR_)genhelp.py $< $@
+        $(PYTHON) $(_SRCDIR_)genhelp.py $< $@
 
 clean: 

doc/user-guide/genhelp.py

@@ -3 +3 @@
 # Usage: python genhelp.py input.xml output.txt
 # (Both python2 (>=2.5) or python3 work)
+#
+# The shebang above isn't used, set the PYTHON environment variable
+# before running ./configure instead
 
 # This program is free software; you can redistribute it and/or