[71942] trunk/dports/_resources/port1.0/group/python24-1.0.tcl

[jmr at macports.org]

Revision: 71942
          http://trac.macports.org/changeset/71942
Author:   jmr at macports.org
Date:     2010-09-28 02:42:53 -0700 (Tue, 28 Sep 2010)
Log Message:
-----------
python24 portgroup: set variables correctly when python is not built as a framework (#25557)

Modified Paths:
--------------
    trunk/dports/_resources/port1.0/group/python24-1.0.tcl

Modified: trunk/dports/_resources/port1.0/group/python24-1.0.tcl
===================================================================
--- trunk/dports/_resources/port1.0/group/python24-1.0.tcl	2010-09-28 08:35:43 UTC (rev 71941)
+++ trunk/dports/_resources/port1.0/group/python24-1.0.tcl	2010-09-28 09:42:53 UTC (rev 71942)
@@ -35,9 +35,14 @@
 set python.branch	2.4
 set python.bin	${prefix}/bin/python${python.branch}
 set python.lib	${prefix}/lib/libpython${python.branch}.dylib
-set python.libdir ${frameworks_dir}/Python.framework/Versions/${python.branch}/lib/python${python.branch}
 set python.pkgd	${prefix}/lib/python${python.branch}/site-packages
+set python.libdir	${frameworks_dir}/Python.framework/Versions/${python.branch}/lib/python${python.branch}
 set python.include	${frameworks_dir}/Python.framework/Versions/${python.branch}/include/python${python.branch}
+if {![file isfile ${python.include}/Python.h] &&
+    ([file isfile ${prefix}/include/python${python.branch}/Python.h] || [string match *64* $build_arch])} {
+    set python.libdir	${prefix}/lib/python${python.branch}
+    set python.include	${prefix}/include/python${python.branch}
+}
 
 categories		python
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100928/2658e2ef/attachment.html>