Merge branch 'PHP-5.5' into PHP-5.6

weltling · weltling · commit 8cc8d4830a99 · 2015-03-12T15:21:33.000+01:00
* PHP-5.5:
  create the php prefix if doesn't exist
diff --git a/win32/build/confutils.js b/win32/build/confutils.js
@@ -1989,6 +1989,7 @@ function generate_makefile()
 			var lib = "php_" + extensions_enabled[i][0] + ".lib";
 			var dll = "php_" + extensions_enabled[i][0] + ".dll";
 			MF.WriteLine("	@copy $(BUILD_DIR)\\" + lib + " $(BUILD_DIR_DEV)\\lib");
+			MF.WriteLine("  @if not exist $(PHP_PREFIX) mkdir $(PHP_PREFIX) >nul");
 			MF.WriteLine("	@copy $(BUILD_DIR)\\" + dll + " $(PHP_PREFIX)");
 		}
 	} else {

Original file line number	Diff line number	Diff line change
`@@ -1989,6 +1989,7 @@ function generate_makefile()`
`1989`	`1989`	`var lib = "php_" + extensions_enabled[i][0] + ".lib";`
`1990`	`1990`	`var dll = "php_" + extensions_enabled[i][0] + ".dll";`
`1991`	`1991`	`MF.WriteLine(" @copy $(BUILD_DIR)\\" + lib + " $(BUILD_DIR_DEV)\\lib");`
	`1992`	`+ MF.WriteLine(" @if not exist $(PHP_PREFIX) mkdir $(PHP_PREFIX) >nul");`
`1992`	`1993`	`MF.WriteLine(" @copy $(BUILD_DIR)\\" + dll + " $(PHP_PREFIX)");`
`1993`	`1994`	`}`
`1994`	`1995`	`} else {`