- expose PHP_BUILD in the Makefile

- ICU 3.8/4.0 are dynamically linked, add $PHP_BUILD\bin to the PATH so php.exe can find them (nmake test, nmake snaps)

diff --git a/win32/build/Makefile b/win32/build/Makefile
index e8d8fa98c2db916fb4e819ef628e5bbf2eeebdac..36b112e439a4f0385d44658fe8a9c4028e7b5196 100644 (file)
--- a/win32/build/Makefile
+++ b/win32/build/Makefile
@@ -22,6 +22,7 @@ LD="$(LINK)"
 MC="$(MC)"
 MT="$(MT)"
 RE2C="$(RE2C)"
+PHP_BUILD=$(PHP_BUILD)
 
 MCFILE=$(BUILD_DIR)\wsyslog.rc
 
@@ -118,6 +119,7 @@ $(BUILD_DIR)\php.exe -d open_basedir= -d output_buffering=0 run-tests.php $(TEST
 <<NOKEEP
 
 build-snap: generated_files
+       SET PATH=$(PATH);$(PHP_BUILD)\bin
        @$(MAKE) "$(BUILD_DIR)\$(PHPDLL)"
        -for %T in ($(SAPI_TARGETS)) do $(MAKE) /I /nologo "%T"
        -for %T in ($(EXT_TARGETS)) do $(MAKE) /I /nologo "%T"

diff --git a/win32/build/config.w32 b/win32/build/config.w32
index 29d19a2776f6ab66b163ab8b82889c002f438e61..b11ed9b16a64d3ea4740f87e7f092d21788f8f3a 100644 (file)
--- a/win32/build/config.w32
+++ b/win32/build/config.w32
@@ -234,6 +234,7 @@ if (PHP_PHP_BUILD == 'no') {
                }
        }
 }
+DEFINE("PHP_BUILD", PHP_PHP_BUILD);
 
 ARG_WITH('extra-includes', 'Extra include path to use when building everything', '');
 ARG_WITH('extra-libs', 'Extra library path to use when linking everything', '');