diff options
| author | Marius Halden <marius.h@lden.org> | 2017-09-06 14:14:40 +0200 |
|---|---|---|
| committer | Marius Halden <marius.h@lden.org> | 2017-09-06 14:14:40 +0200 |
| commit | f849ef86076ed17c9dbaeeb425dba084dc9c52ba (patch) | |
| tree | 952526fbf44e27a45eec14b0f4ceb03eead0cd67 /configure | |
| parent | 9bc82d46e26ecd4947c3ee840d3e1e2dcc655640 (diff) | |
| parent | ad66dcd65ee6e84f25fdb46956df0ad3041d0ced (diff) | |
Merge branch 'master' into patched-master
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -248,6 +248,7 @@ cat<<EOF >config.h #define ETCDIR "$etcdir" #define VARDIR "$datadir" #define PLUGINDIR "$plugindir" +#define DATADIR "$datadir" #define PIDFILE "$pidfile" #define IPCSOCKET "$ipcsocket" EOF @@ -779,7 +780,7 @@ 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 [ ! -e $srcdir/doc/user-guide/help.txt ] && ! $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)" @@ -823,6 +824,7 @@ prefix=$prefix includedir=$includedir plugindir=$plugindir libdir=$libdir +datadir=$datadir Name: bitlbee Description: IRC to IM gateway |