summaryrefslogtreecommitdiffstats
path: root/packaging
diff options
context:
space:
mode:
authorMichael Wybrow <michael.wybrow@monash.edu>2010-11-08 22:33:46 +0000
committerMichael Wybrow <Michael.Wybrow@infotech.monash.edu.au>2010-11-08 22:33:46 +0000
commit26f49e4813747b6cd775d3521bc5597d3231223f (patch)
treed1559e7373bd2c2887aa974b865a101419cd4e8e /packaging
parentUpdate ignore list to include the recently added i18n file, backup.bzr (diff)
downloadinkscape-26f49e4813747b6cd775d3521bc5597d3231223f.tar.gz
inkscape-26f49e4813747b6cd775d3521bc5597d3231223f.zip
Fix bug #482993: Python extensions not working on Mac OS X 10.6
Fixed bugs: - https://launchpad.net/bugs/482993 (bzr r9882.1.1)
Diffstat (limited to 'packaging')
-rwxr-xr-xpackaging/macosx/Resources/bin/inkscape9
1 files changed, 9 insertions, 0 deletions
diff --git a/packaging/macosx/Resources/bin/inkscape b/packaging/macosx/Resources/bin/inkscape
index 2621b7db9..07aa65cd2 100755
--- a/packaging/macosx/Resources/bin/inkscape
+++ b/packaging/macosx/Resources/bin/inkscape
@@ -23,6 +23,15 @@ TOP="`dirname \"$CWD\"`"
# LaTeX distribution for Mac OS X
export PATH="/usr/texbin:/opt/local/bin:/sw/bin/:/Library/Frameworks/Python.framework/Versions/Current/bin:/usr/local/bin:$CWD:$PATH"
+# Put /usr/bin at beginning of path so we make sure we use Apple's python
+# over one that may be installed be Macports, Fink or some other means.
+export PATH="/usr/bin:$PATH"
+
+# On Snow Leopard, use the 32-bit version of python from Universal build.
+# This is because our bundled i386 python libraries are 32-bit only.
+export VERSIONER_PYTHON_PREFER_32_BIT=yes
+
+
# Setup PYTHONPATH to use python modules shipped with Inkscape
ARCH=`arch`
PYTHON_VERS=`python -V 2>&1 | cut -c 8-10`