diff options
| author | Krzysztof Kosi??ski <tweenk.pl@gmail.com> | 2010-11-25 20:51:17 +0000 |
|---|---|---|
| committer | Krzysztof Kosiński <tweenk.pl@gmail.com> | 2010-11-25 20:51:17 +0000 |
| commit | 0bd9f7e209d522dbcebe0449a91397fdd9e38977 (patch) | |
| tree | 834c7d02456658b57625ab68cc28f7854a5a85dc /packaging | |
| parent | Fix handling of x and y attributes of patterns (diff) | |
| parent | Fix ruler redraw issue on GTK 2.22 (diff) | |
| download | inkscape-0bd9f7e209d522dbcebe0449a91397fdd9e38977.tar.gz inkscape-0bd9f7e209d522dbcebe0449a91397fdd9e38977.zip | |
Merge from trunk
(bzr r9508.1.70)
Diffstat (limited to 'packaging')
| -rwxr-xr-x | packaging/macosx/Resources/bin/inkscape | 9 | ||||
| -rwxr-xr-x | packaging/win32/inkscape.nsi | 1 |
2 files changed, 10 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` diff --git a/packaging/win32/inkscape.nsi b/packaging/win32/inkscape.nsi index 00b443f67..b552a23fc 100755 --- a/packaging/win32/inkscape.nsi +++ b/packaging/win32/inkscape.nsi @@ -296,6 +296,7 @@ Section $(Core) SecCore ; Mandatory Inkscape core files section {{{ SetAutoClose false File /a ..\..\inkscape\ink*.exe + File /a ..\..\inkscape\inkscape.com File /a ..\..\inkscape\AUTHORS File /a ..\..\inkscape\COPYING File /a ..\..\inkscape\COPYING.LIB |