pajoye                                   Sun, 02 Jan 2011 18:14:50 +0000

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

Log:
- typo, and remove undesired committed part

Changed paths:
    U   php/php-src/branches/PHP_5_3/win32/build/Makefile
    U   php/php-src/branches/PHP_5_3/win32/build/confutils.js

Modified: php/php-src/branches/PHP_5_3/win32/build/Makefile
===================================================================
--- php/php-src/branches/PHP_5_3/win32/build/Makefile   2011-01-02 18:13:20 UTC 
(rev 306998)
+++ php/php-src/branches/PHP_5_3/win32/build/Makefile   2011-01-02 18:14:50 UTC 
(rev 306999)
@@ -182,7 +182,7 @@
        @copy win32\build\template.rc $(BUILD_DIR_DEV)\build\ /y >nul
        @copy $(BUILD_DIR)\devel\config.phpize.js $(BUILD_DIR_DEV)\script\ /y 
>nul
        @copy $(BUILD_DIR)\devel\phpize.js $(BUILD_DIR_DEV)\script\ /y >nul
-       copy $(BUILD_DIR)\devel\ext_deps.js $(BUILD_DIR_DEV)\script\ /y >nul
+       @copy $(BUILD_DIR)\devel\ext_deps.js $(BUILD_DIR_DEV)\script\ /y >nul

 install-sdk: build-devel
        @xcopy /Q /Y /E /I $(BUILD_DIR_DEV)\* $(PHP_PREFIX)\SDK

Modified: php/php-src/branches/PHP_5_3/win32/build/confutils.js
===================================================================
--- php/php-src/branches/PHP_5_3/win32/build/confutils.js       2011-01-02 
18:13:20 UTC (rev 306998)
+++ php/php-src/branches/PHP_5_3/win32/build/confutils.js       2011-01-02 
18:14:50 UTC (rev 306999)
@@ -1129,11 +1129,6 @@
        var dep_present = false;
        var dep_shared = false;

-       if (MODE_PHPIZE) {
-               ext_deps_js = file_get_contents(PHP_DIR + "\\ext_deps.js");
-               eval(ext_deps_js);
-       }
-
        try {
                dep_present = eval("PHP_" + DEP);


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

Reply via email to