Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5: fix nmake snap when ext name is different in target dll
mudou · Jul 21, 2014 · a6ecb87 · a6ecb87
2 parents f6d941e + 6fcd8e5
commit a6ecb87
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/win32/build/confutils.js b/win32/build/confutils.js
@@ -1994,11 +1994,14 @@ function generate_makefile()
 	} else {
 		MF.WriteBlankLines(1);
 		MF.WriteLine("build-ext-libs:");
+		MF.WriteLine("	@if not exist $(BUILD_DIR_DEV)\\lib mkdir $(BUILD_DIR_DEV)\\lib >nul");
 		for (var i in extensions_enabled) {
-			var lib = "php_" + extensions_enabled[i][0] + ".lib";
+			var lib;
+
+			lib = "php_" + extensions_enabled[i][0] + "*.lib";
 
 			if ('shared' == extensions_enabled[i][1]) {
-				MF.WriteLine("	@copy $(BUILD_DIR)\\" + lib + " $(BUILD_DIR_DEV)\\lib");
+				MF.WriteLine("	@if exist $(BUILD_DIR)\\" + lib + " copy $(BUILD_DIR)\\" + lib + " $(BUILD_DIR_DEV)\\lib");
 			}
 		}
 	}