[PATCH] Autotools cleanup
Hi !
The following patches series cleanups the installation by autotools, fix confusing with datadir variable and finally allows to install pyfiles in python/site-packages (disabled by default).
-
autotools: add a new autoconf variable: ${gajim_srcdir}. It expanded version is GAJIM_SRCDIR.
It indicate where pyfiles will be installed (for now: PREFIX/share/gajim/src).
simplify src/Makefile.am by using nobase_ and dist_ prefix. nobase_ allows hiearchical installation instead of flat directory installation.
-
autotools: cleanup Makefile.am for data/* and icons.
use autotools tricks: nobase_ prefix -> hiearchical installation dist_ prefix -> include files in dist archive
-
autotools: remove confusing variables ${datadir} and DATADIR.
Those variables were confusing because autoconf usually defines DATADIR to PREFIX/share and gajim uses both defs.datadir=PREFIX/share/gajim and gajim.DATA_DIR=PREFIX/share/gajim/data.
Now, autoconf will use PKGDATADIR for setting the (renamed) defs.basedir variable which will be used to set gajimpaths['DATA_DIR'] and gajimpaths['ICONS_DIR'] in configpaths.py
Gajim will also looks for the ${GAJIM_BASEDIR} environment variable instead of ${datadir} which was really too generic (no namespace).
-
autotools: add --enable-site-packages option
This option allows the installation of pyfiles in PYTHON/site-packages/gajim instead of DATADIR/gajim/src which is a quality policy for some distributions.
b/configure.ac | 11 ++++++++++ b/data/Makefile.am | 2 - b/data/activities/Makefile.am | 36 ----------------------------------- b/data/defs.py.in | 2 - b/data/emoticons/Makefile.am | 39 +++----------------------------------- b/data/iconsets/Makefile.am | 43 ++++++------------------------------------ b/data/moods/Makefile.am | 36 ----------------------------------- b/data/pixmaps/Makefile.am | 24 +++++++++-------------- b/icons/Makefile.am | 36 ----------------------------------- b/scripts/gajim.in | 2 - b/src/Makefile.am | 39 +++++++------------------------------- b/src/common/configpaths.py | 11 +++------- b/src/common/defs.py | 2 - configure.ac | 15 ++++++++++++-- scripts/gajim.in | 5 ---- 15 files changed, 65 insertions(+), 238 deletions(-)