pajoye                                   Mon, 24 Aug 2009 14:18:19 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=287638

Log:
- fix object dir usage (ie: relative path called from a symlinked dir), also 
fix nmake test for similar cases

Changed paths:
    U   php/php-src/branches/PHP_5_3/win32/build/config.w32
    U   php/php-src/trunk/win32/build/config.w32

Modified: php/php-src/branches/PHP_5_3/win32/build/config.w32
===================================================================
--- php/php-src/branches/PHP_5_3/win32/build/config.w32 2009-08-24 14:10:30 UTC 
(rev 287637)
+++ php/php-src/branches/PHP_5_3/win32/build/config.w32 2009-08-24 14:18:19 UTC 
(rev 287638)
@@ -82,6 +82,7 @@
 // stick objects somewhere outside of the source tree
 ARG_ENABLE('object-out-dir', 'Alternate location for binary objects during 
build', '');
 if (PHP_OBJECT_OUT_DIR.length) {
+       PHP_OBJECT_OUT_DIR = FSO.GetAbsolutePathName(PHP_OBJECT_OUT_DIR);
        if (!FSO.FolderExists(PHP_OBJECT_OUT_DIR)) {
                ERROR('you chosen output directory ' + PHP_OBJECT_OUT_DIR + ' 
does not exist');
        }

Modified: php/php-src/trunk/win32/build/config.w32
===================================================================
--- php/php-src/trunk/win32/build/config.w32    2009-08-24 14:10:30 UTC (rev 
287637)
+++ php/php-src/trunk/win32/build/config.w32    2009-08-24 14:18:19 UTC (rev 
287638)
@@ -82,6 +82,7 @@
 // stick objects somewhere outside of the source tree
 ARG_ENABLE('object-out-dir', 'Alternate location for binary objects during 
build', '');
 if (PHP_OBJECT_OUT_DIR.length) {
+       PHP_OBJECT_OUT_DIR = FSO.GetAbsolutePathName(PHP_OBJECT_OUT_DIR);
        if (!FSO.FolderExists(PHP_OBJECT_OUT_DIR)) {
                ERROR('you chosen output directory ' + PHP_OBJECT_OUT_DIR + ' 
does not exist');
        }

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to