[45944] branches/release_1_7

[blb at macports.org]

Revision: 45944
          http://trac.macports.org/changeset/45944
Author:   blb at macports.org
Date:     2009-01-25 15:04:56 -0800 (Sun, 25 Jan 2009)
Log Message:
-----------
Merge r44363 from trunk: portmain: configure.universal_target is never set here, use universal_target

Modified Paths:
--------------
    branches/release_1_7/base/src/port1.0/portmain.tcl

Property Changed:
----------------
    branches/release_1_7/


Property changes on: branches/release_1_7
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk:42683,42697,42734,42747,42760,42845-42847,42865,42962,42978,43001,43080,43083,43097,43140,43153,43194,43216-43217,43229,43704-43705,43733,43946,43954,43960,45161,45201
/trunk/base:45161
   + /trunk:42683,42697,42734,42747,42760,42845-42847,42865,42962,42978,43001,43080,43083,43097,43140,43153,43194,43216-43217,43229,43704-43705,43733,43946,43954,43960,44363,45161,45201
/trunk/base:45161

Modified: branches/release_1_7/base/src/port1.0/portmain.tcl
===================================================================
--- branches/release_1_7/base/src/port1.0/portmain.tcl	2009-01-25 22:52:48 UTC (rev 45943)
+++ branches/release_1_7/base/src/port1.0/portmain.tcl	2009-01-25 23:04:56 UTC (rev 45944)
@@ -119,10 +119,7 @@
 
     if {[info exists variations(universal)] && $variations(universal) == "+"} {
         # cannot go into the variant, due to the amount of ports overriding it
-        global configure.universal_target
-        if {[info exists configure.universal_target]} {
-            eval macosx_deployment_target ${configure.universal_target}
-        }
+        eval macosx_deployment_target ${universal_target}
     }
 }
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090125/2f83e8ac/attachment.html>