From ffe4cc57143369ee0c2f571f896968e13e2b3b6a Mon Sep 17 00:00:00 2001 From: Don Allingham Date: Mon, 7 Jul 2003 02:34:06 +0000 Subject: [PATCH] * gramps.sh.in: Don't override an existing PYTHONPATH environment variable svn: r1831 --- gramps.sh.in | 23 +++++------------------ 1 file changed, 5 insertions(+), 18 deletions(-) diff --git a/gramps.sh.in b/gramps.sh.in index f91c9f02b..d5287e0c8 100644 --- a/gramps.sh.in +++ b/gramps.sh.in @@ -23,26 +23,13 @@ prefix=@prefix@ export GRAMPSDIR=@datadir@/@PACKAGE@ -export PYTHONPATH=$GRAMPSDIR export GRAMPSI18N=@prefix@/share/locale -preload="" - -# -# Mandrake has a tendency to build dynamic libraries without the proper -# dependencies in them. This causes havoc with the python gtk libraries. -# Preload the know problem libraries so that gramps does not fail under -# Mandrake -# -for l in /usr/X11R6/lib/libX11.so -do - if [ -f $l ]; then - preload="$preload $l" - fi -done - -if [ "$preload" != "" ]; then - export LD_PRELOAD="$preload" +if [ "$PYTHONPATH" == "" ] +then + export PYTHONPATH=$GRAMPSDIR +else + export PYTHONPATH=$GRAMPSDIR:$PYTHONPATH fi exec @PYTHON@ $GRAMPSDIR/gramps.py $*