* configure.in: Detect iconv at configuration time.
* src/po/Makefile.am: Invoke detected iconv in its simplest form. Minor cleanup. * gramps.sh.in: Correct paths for systems with custom datadir. * src/DisplayTrace.py: Check for LANG before including in the message. svn: r2279
This commit is contained in:
@@ -22,16 +22,19 @@
|
||||
|
||||
prefix=@prefix@
|
||||
exec_prefix=@exec_prefix@
|
||||
PACKAGE=@PACKAGE@
|
||||
|
||||
export GRAMPSDIR=@datadir@/@PACKAGE@
|
||||
export GRAMPSPYDIR=@pkgpythondir@
|
||||
export GRAMPSPLUGINSDIR=$GRAMPSPYDIR/plugins:$GRAMPSPYDIR/docgen:$GRAMPSPYDIR/filters
|
||||
export GRAMPSLIBDIR=@libdir@/@PACKAGE@
|
||||
export GRAMPSI18N=@prefix@/share/locale
|
||||
|
||||
if [ "$PYTHONPATH" = "" ]
|
||||
then
|
||||
export PYTHONPATH=$GRAMPSDIR:$GRAMPSLIBDIR
|
||||
export PYTHONPATH=$GRAMPSDIR:$GRAMPSPLUGINSDIR:$GRAMPSLIBDIR
|
||||
else
|
||||
export PYTHONPATH=$GRAMPSDIR:$GRAMPSLIBDIR:$PYTHONPATH
|
||||
export PYTHONPATH=$GRAMPSDIR:$GRAMPSLIBDIR:$GRAMPSPLUGINSDIR:$PYTHONPATH
|
||||
fi
|
||||
|
||||
exec @PYTHON@ $GRAMPSDIR/gramps.py $*
|
||||
exec @PYTHON@ $GRAMPSPYDIR/gramps.py $*
|
||||
|
Reference in New Issue
Block a user