diff options
| author | JiHO <jiho-sf@users.sourceforge.net> | 2007-12-27 13:14:25 +0000 |
|---|---|---|
| committer | jiho-sf <jiho-sf@users.sourceforge.net> | 2007-12-27 13:14:25 +0000 |
| commit | 78a25e395f24b092252994dc050936de6016e1be (patch) | |
| tree | 0512d37fb22a72994a9e1029af3adb729dd709ff | |
| parent | 1) Fix bug #178312 (diff) | |
| download | inkscape-78a25e395f24b092252994dc050936de6016e1be.tar.gz inkscape-78a25e395f24b092252994dc050936de6016e1be.zip | |
Add support for python module tree (i.e. directories with all python modules versions for ppc and intel, for python versions 2.3, 2.4 and 2.5)
(bzr r4315)
| -rwxr-xr-x | packaging/macosx/Resources/bin/inkscape | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/packaging/macosx/Resources/bin/inkscape b/packaging/macosx/Resources/bin/inkscape index 53679e6c3..2242f6861 100755 --- a/packaging/macosx/Resources/bin/inkscape +++ b/packaging/macosx/Resources/bin/inkscape @@ -22,12 +22,11 @@ TOP="`dirname \"$CWD\"`" # MacPorts (former DarwinPorts) export PATH="/opt/local/bin:/sw/bin/:/Library/Frameworks/Python.framework/Versions/Current/bin:/usr/local/bin:$CWD:$PATH" -# Test wether we are using the stock python install -# In which case we can use the python modules shipped alongside Inkscape, in the app bundle -if [ `which python` = "/usr/bin/python" ]; then - export PYTHONPATH="$TOP/python/site-packages" - # NB: we are only preprending some stuff to the default python path so if the directory does not exist it should not harm the rest -fi +# Setup PYTHONPATH to use python modules shipped with Inkscape +ARCH=`arch` +PYTHON_VERS=`python -V 2>&1 | cut -c 8-10` +export PYTHONPATH="$TOP/python/site-packages/$ARCH/$PYTHON_VERS" +# NB: we are only preprending some stuff to the default python path so if the directory does not exist it should not harm the rest export DYLD_LIBRARY_PATH="$TOP/lib" |