summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRonald Oussoren <ronaldoussoren@mac.com>2009-06-08 20:54:59 (GMT)
committerRonald Oussoren <ronaldoussoren@mac.com>2009-06-08 20:54:59 (GMT)
commit8e631258ad864a40f6b89a615011ebf059c9c974 (patch)
treeb5675c3349073e1c9f53c4854f2637ca7abdc9f5
parent0c6d16647984c6e274662bb64ee99bf2c1c2a86c (diff)
downloadcpython-8e631258ad864a40f6b89a615011ebf059c9c974.zip
cpython-8e631258ad864a40f6b89a615011ebf059c9c974.tar.gz
cpython-8e631258ad864a40f6b89a615011ebf059c9c974.tar.bz2
This checkin adds a symlink to the lib directory of a framework install
of Python (on OSX), and the end result of that is that the combination of ``python-config --ldflags`` and ``python-config --libs`` refers to an actually existing location. I've done this in preference to changing python-config to specify '-framework Python' for linking because that doesn't work when you have multiple versions of python installed (because '-framework Python' will always link to the 'Current' version of the framework, without a possibility to specify a specific version).
-rw-r--r--Makefile.pre.in1
1 files changed, 1 insertions, 0 deletions
diff --git a/Makefile.pre.in b/Makefile.pre.in
index b59c346..7e99da0 100644
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -1068,6 +1068,7 @@ frameworkinstallstructure: $(LDLIBRARY)
# install (which includes python-config) happy.
frameworkinstallmaclib:
ln -fs "../../../$(PYTHONFRAMEWORK)" "$(DESTDIR)$(prefix)/lib/python$(VERSION)/config/libpython$(VERSION).a"
+ ln -fs "../$(PYTHONFRAMEWORK)" "$(DESTDIR)$(prefix)/lib/libpython$(VERSION).dylib"
cd Mac && $(MAKE) installmacsubtree DESTDIR="$(DESTDIR)"
# This installs the IDE, the Launcher and other apps into /Applications