Changeset 1cef55f


Ignore:
Timestamp:
2015-06-04T17:13:22Z (5 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:
3 edited

Legend:

Unmodified
Added
Removed
  • configure

    rfd45e859 r1cef55f  
    685685fi
    686686
     687if [ -z "$PYTHON" ]; then
     688        PYTHON=python
     689fi
     690
    687691if [ "$doc" = "1" ]; then
    688692        # check this here just in case someone tries to install it in python2.4...
    689         if ! python -m xml.etree.ElementTree > /dev/null 2>&1; then
     693        if ! $PYTHON -m xml.etree.ElementTree > /dev/null 2>&1; then
    690694                echo
    691695                echo 'ERROR: Python (>=2.5 or 3.x) is required to generate docs'
     696                echo "(Use the PYTHON environment variable if it's in a weird location)"
    692697                exit 1
    693698        fi
    694699        echo "DOC=1" >> Makefile.settings
     700        echo "PYTHON=$PYTHON" >> Makefile.settings
    695701fi
    696702
  • doc/user-guide/Makefile

    rfd45e859 r1cef55f  
    33_SRCDIR_ := $(_SRCDIR_)doc/user-guide/
    44endif
     5
     6ifndef PYTHON
     7PYTHON = python
     8endif
    59
    610all: help.txt
     
    3236
    3337help.txt: $(_SRCDIR_)help.xml $(_SRCDIR_)commands.xml $(_SRCDIR_)misc.xml $(_SRCDIR_)quickstart.xml
    34         python $(_SRCDIR_)genhelp.py $< $@
     38        $(PYTHON) $(_SRCDIR_)genhelp.py $< $@
    3539
    3640clean:
  • doc/user-guide/genhelp.py

    rfd45e859 r1cef55f  
    33# Usage: python genhelp.py input.xml output.txt
    44# (Both python2 (>=2.5) or python3 work)
     5#
     6# The shebang above isn't used, set the PYTHON environment variable
     7# before running ./configure instead
    58
    69# This program is free software; you can redistribute it and/or
Note: See TracChangeset for help on using the changeset viewer.