summaryrefslogtreecommitdiff
path: root/win32
diff options
context:
space:
mode:
authorMoriyoshi Koizumi <moriyoshi@php.net>2011-03-02 05:22:22 (GMT)
committerMoriyoshi Koizumi <moriyoshi@php.net>2011-03-02 05:22:22 (GMT)
commitf093c7db8d7b883bcc1d3beb0e0384cce1e047de (patch)
tree24f491444cecc799910318f50fa2f075e2059420 /win32
parent18097605b7824c4d040c15f327ab613b5838b137 (diff)
downloadphp-f093c7db8d7b883bcc1d3beb0e0384cce1e047de.tar.gz
- Enable windows build system to accept paths containing spaces.
Diffstat (limited to 'win32')
-rw-r--r--win32/build/Makefile6
-rw-r--r--win32/build/config.w322
2 files changed, 4 insertions, 4 deletions
diff --git a/win32/build/Makefile b/win32/build/Makefile
index 5ccb2a9..5770e89 100644
--- 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 49c55da..b2fbea3 100644
--- 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()