From: Pierre Joye <pajoye@php.net>
Date: Fri, 21 Nov 2008 14:18:27 +0000 (+0000)
Subject: - MFH:
X-Git-Tag: php-5.3.0alpha2~112
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=67d86010ae8a48fa11481b29f06f6f77359f56fb;p=php

- MFH:
 - 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 5fe735e32e..fd8ff43b8a 100644
--- 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 safe_mode=0 -d output_buffering=0 run-t
 <<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 9b7fd90903..591f11cc49 100644
--- a/win32/build/config.w32
+++ b/win32/build/config.w32
@@ -236,6 +236,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', '');