[90630] trunk/dports/_resources/port1.0/group/php-1.0.tcl

[ryandesign at macports.org]

Revision: 90630
          http://trac.macports.org/changeset/90630
Author:   ryandesign at macports.org
Date:     2012-03-10 14:04:39 -0800 (Sat, 10 Mar 2012)
Log Message:
-----------
php-1.0.tcl: Add php.config option/default

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

Modified: trunk/dports/_resources/port1.0/group/php-1.0.tcl
===================================================================
--- trunk/dports/_resources/port1.0/group/php-1.0.tcl	2012-03-10 18:20:20 UTC (rev 90629)
+++ trunk/dports/_resources/port1.0/group/php-1.0.tcl	2012-03-10 22:04:39 UTC (rev 90630)
@@ -54,9 +54,11 @@
 default destroot.dir            {[lindex ${php.build_dirs} 0]}
 options php.build_dirs
 default php.build_dirs          {[php.build_dirs_proc]}
+options php.config
+default php.config              {${prefix}/bin/php-config}
 options php.extensions
 options php.extension_dir
-default php.extension_dir       {[exec ${prefix}/bin/php-config --extension-dir 2>/dev/null]}
+default php.extension_dir       {[exec ${php.config} --extension-dir 2>/dev/null]}
 options php.ini
 default php.ini                 {[lindex ${php.extensions} 0].ini}
 options php.inidir
@@ -194,7 +196,7 @@
         }
         
         pre-configure {
-            set php_version [exec ${prefix}/bin/php-config --version 2>/dev/null]
+            set php_version [exec ${php.config} --version 2>/dev/null]
             if {${version} != ${php_version}} {
                 ui_error "${name} ${version} requires PHP ${version} but you have PHP ${php_version}."
                 return -code error "incompatible PHP installation"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120310/94980aa5/attachment.html>