- Enable windows build system to accept paths containing spaces.

diff --git a/win32/build/Makefile b/win32/build/Makefile
index 5ccb2a95ad4b188766cc3bedcd7e0721125ae60b..5770e89cc1dbb76a530c36f3b4a957fb18eadd9b 100644 (file)
--- a/win32/build/Makefile
+++ b/win32/build/Makefile
@@ -93,7 +93,7 @@ $(BUILD_DIR) $(BUILD_DIRS_SUB) $(BUILD_DIR_DEV):
        @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 @@ clean: clean-sapi
        @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 @@ clean-all:
        @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:

diff --git a/win32/build/config.w32 b/win32/build/config.w32
index 49c55daa467783366b51db23b382165798cb2a50..b2fbea3ab71f32fbea54091262c9292e2b2caf87 100644 (file)
--- a/win32/build/config.w32
+++ b/win32/build/config.w32
@@ -271,7 +271,7 @@ var php_usual_include_suspects = PHP_PHP_BUILD+"\\include";
 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()