MFH:

* Fix deprecation warning when building deplister
* Fix some mkdir warnings if "nmake build-dist" is executed twice

diff --git a/win32/build/Makefile b/win32/build/Makefile
index 69442fe1cbb19ccf5c2e342b8f8b3a3b2bf292a4..d13f330668e24bf88f893dadaa9f87d9f547d63a 100644 (file)
--- a/win32/build/Makefile
+++ b/win32/build/Makefile
@@ -146,7 +146,7 @@ dist: all build-dist
 snap: build-snap build-dist
 
 $(BUILD_DIR)\deplister.exe:    win32\build\deplister.c
-       $(CL) /Fo$(BUILD_DIR)\ /Fd$(BUILD_DIR)\ /Fp$(BUILD_DIR)\ /FR$(BUILD_DIR) -o$(BUILD_DIR)\deplister.exe win32\build\deplister.c imagehlp.lib
+       $(CL) /Fo$(BUILD_DIR)\ /Fd$(BUILD_DIR)\ /Fp$(BUILD_DIR)\ /FR$(BUILD_DIR) /Fe$(BUILD_DIR)\deplister.exe win32\build\deplister.c imagehlp.lib
 
 msi-installer: dist
        $(BUILD_DIR)\php.exe ..\php-installer\build-installer.php "$(BUILD_DIR)" "$(PHPDLL)" "$(SAPI_TARGETS)" "$(EXT_TARGETS)" "$(PECL_TARGETS)"

diff --git a/win32/build/mkdist.php b/win32/build/mkdist.php
index 6a795f9b6482c940b09dd8552be04fa7e74058ff..c92028dd8513c35be90544938b402bae8e19033e 100644 (file)
--- a/win32/build/mkdist.php
+++ b/win32/build/mkdist.php
@@ -381,7 +381,9 @@ function copy_test_dir($directory, $dest)
                $full_path = $directory . '/' . $file;
                if($file != '.' && $file != '..' && $file != 'CVS' && is_dir($full_path)) {
                        if ($file == 'tests') {
-                               mkdir($dest . '/' . $full_path , 0775, true);
+                               if (!is_dir($dest . '/' . $full_path)) {
+                                       mkdir($dest . '/' . $full_path , 0775, true);
+                               }
                                copy_dir($full_path, $dest . '/' . $full_path . '/');
                                continue;
                        } else {