diff --git a/win32/build/Makefile b/win32/build/Makefile index 42969674925..efe1a16b00b 100644 --- a/win32/build/Makefile +++ b/win32/build/Makefile @@ -98,7 +98,7 @@ build-dist: $(BUILD_DIR)\deplister.exe -del /f /q $(BUILD_DIR)\php-$(PHP_VERSION_STRING)-Win32.zip -del /f /q $(BUILD_DIR)\php-debug-pack-$(PHP_VERSION_STRING)-Win32.zip -del /f /q $(BUILD_DIR)\pecl-$(PHP_VERSION_STRING)-Win32.zip - $(BUILD_DIR)\php.exe -n win32/build/mkdist.php "$(BUILD_DIR)" "$(PHPDLL)" "$(SAPI_TARGETS)" "$(EXT_TARGETS)" "$(PECL_TARGETS)" "$(SNAPSHOT_TEMPLATE)" + $(BUILD_DIR)\php.exe -n win32/build/mkdist.php "$(BUILD_DIR)" "$(PHPDLL)" "$(SAPI_TARGETS)" "$(EXT_TARGETS) $(PHP_EXTRA_DIST_FILES)" "$(PECL_TARGETS) $(PECL_EXTRA_DIST_FILES)" "$(SNAPSHOT_TEMPLATE)" cd $(BUILD_DIR)\php-$(PHP_VERSION_STRING) -$(ZIP) -9 -r ..\php-$(PHP_VERSION_STRING)-Win32.zip . cd ..\.. diff --git a/win32/build/confutils.js b/win32/build/confutils.js index 31ba81ee80a..ad2552e83b9 100644 --- a/win32/build/confutils.js +++ b/win32/build/confutils.js @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -// $Id: confutils.js,v 1.42.2.2 2005-02-13 21:40:28 wez Exp $ +// $Id: confutils.js,v 1.42.2.3 2005-02-26 01:10:50 edink Exp $ var STDOUT = WScript.StdOut; var STDERR = WScript.StdErr; @@ -917,6 +917,15 @@ function SAPI(sapiname, file_list, makefiletarget, cflags) MFO.WriteBlankLines(1); } +function ADD_DIST_FILE(filename) +{ + if (configure_module_dirname.match("pecl")) { + ADD_FLAG("PECL_EXTRA_DIST_FILES", filename); + } else { + ADD_FLAG("PHP_EXTRA_DIST_FILES", filename); + } +} + function file_get_contents(filename) { var f, c;