summaryrefslogtreecommitdiffstats
path: root/Makefile.pre.in
diff options
context:
space:
mode:
authorRonald Oussoren <ronaldoussoren@mac.com>2009-06-08 21:04:41 (GMT)
committerRonald Oussoren <ronaldoussoren@mac.com>2009-06-08 21:04:41 (GMT)
commit0d2cceb01ca2d285aafcf92ad6a9dfcc61f4d722 (patch)
tree32682f753cbbb749a97f360409b563cbf1af2136 /Makefile.pre.in
parent10e0e301018d00ca70bef3c7ebb20cbab47bd2e0 (diff)
downloadcpython-0d2cceb01ca2d285aafcf92ad6a9dfcc61f4d722.zip
cpython-0d2cceb01ca2d285aafcf92ad6a9dfcc61f4d722.tar.gz
cpython-0d2cceb01ca2d285aafcf92ad6a9dfcc61f4d722.tar.bz2
Merged revisions 73303 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r73303 | ronald.oussoren | 2009-06-08 13:54:59 -0700 (Mon, 08 Jun 2009) | 11 lines 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). ........
Diffstat (limited to 'Makefile.pre.in')
-rw-r--r--Makefile.pre.in1
1 files changed, 1 insertions, 0 deletions
diff --git a/Makefile.pre.in b/Makefile.pre.in
index 20483f7..2f5cccc 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"
# This installs the IDE, the Launcher and other apps into /Applications
frameworkinstallapps: