moriyoshi Wed, 02 Mar 2011 18:35:10 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=308863
Log:
- Merge from trunk.
Changed paths:
U php/php-src/branches/PHP_5_3/win32/build/Makefile
U php/php-src/branches/PHP_5_3/win32/build/config.w32
Modified: php/php-src/branches/PHP_5_3/win32/build/Makefile
===================================================================
--- php/php-src/branches/PHP_5_3/win32/build/Makefile 2011-03-02 18:08:27 UTC
(rev 308862)
+++ php/php-src/branches/PHP_5_3/win32/build/Makefile 2011-03-02 18:35:10 UTC
(rev 308863)
@@ -93,7 +93,7 @@
@cd $(BUILD_DIR)
@for %D in ($(BUILD_DIRS_SUB)) do @if not exist %D @mkdir %D > NUL
@if not exist $(BUILD_DIR_DEV) @mkdir $(BUILD_DIR_DEV) > NUL
- @cd $(PHP_SRC_DIR)
+ @cd "$(PHP_SRC_DIR)"
clean-sapi:
@@ -107,7 +107,7 @@
@echo Cleaning distribution build dirs
@cd $(BUILD_DIR)
@for %D in (_x $(BUILD_DIRS_SUB)) do @if exist %D @del /F /Q %D\*.* >
NUL
- @cd $(PHP_SRC_DIR)
+ @cd "$(PHP_SRC_DIR)"
-@del /F /Q $(BUILD_DIR)\*.res $(BUILD_DIR)\*.lib $(BUILD_DIR)\*.ilk
$(BUILD_DIR)\*.pdb $(BUILD_DIR)\*.exp $(PHPDEF)
$(BUILD_DIR)\php-$(PHP_VERSION_STRING)-Win32.zip
$(BUILD_DIR)\pecl-$(PHP_VERSION_STRING)-Win32.zip > NUL
-rd /s /q $(BUILD_DIR)\php-$(PHP_VERSION_STRING)
@@ -119,7 +119,7 @@
@echo Cleaning standard build dirs
@cd $(BUILD_DIR)
@for %D in (_x $(BUILD_DIRS_SUB)) do @if exist %D @rd /s /q %D
- @cd $(PHP_SRC_DIR)
+ @cd "$(PHP_SRC_DIR)"
-@del /f /q $(BUILD_DIR)\*.res $(BUILD_DIR)\*.lib $(BUILD_DIR)\*.ilk
$(BUILD_DIR)\*.pdb $(BUILD_DIR)\*.exp $(PHPDEF) $(BUILD_DIR)\*.rc
$(BUILD_DIR)\*.dbg $(BUILD_DIR)\*.bin $(BUILD_DIR)\php*.dll
$(BUILD_DIR)\php*.exe > NUL
test:
Modified: php/php-src/branches/PHP_5_3/win32/build/config.w32
===================================================================
--- php/php-src/branches/PHP_5_3/win32/build/config.w32 2011-03-02 18:08:27 UTC
(rev 308862)
+++ php/php-src/branches/PHP_5_3/win32/build/config.w32 2011-03-02 18:35:10 UTC
(rev 308863)
@@ -266,7 +266,7 @@
var php_usual_lib_suspects = PHP_PHP_BUILD+"\\lib";
ADD_FLAG("CFLAGS", '/I "' + php_usual_include_suspects + '" ');
-ADD_FLAG("LDFLAGS", '/libpath:"\\"' + php_usual_lib_suspects + '\\"" ');
+ADD_FLAG("LDFLAGS", '/libpath:"' + php_usual_lib_suspects + '" ');
// Poke around for some headers
function probe_basic_headers()
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
