From: Anatol Belski Date: Sun, 31 May 2015 21:01:21 +0000 (+0200) Subject: fix phpize mode for manifest embedding X-Git-Tag: php-5.5.27RC1~23 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f029a2856b40dfb9093b85414c3e7419c43516f4;p=php fix phpize mode for manifest embedding --- diff --git a/win32/build/confutils.js b/win32/build/confutils.js index 9c68a97037..5c090cf3c5 100644 --- a/win32/build/confutils.js +++ b/win32/build/confutils.js @@ -920,8 +920,13 @@ function generate_version_info_manifest(makefiletarget) { var manifest_name = makefiletarget + ".manifest"; - MFO.WriteLine("$(BUILD_DIR)\\" + manifest_name + ": win32\\build\\default.manifest"); - MFO.WriteLine("\t@copy $(PHP_SRC_DIR)\\win32\\build\\default.manifest $(BUILD_DIR)\\" + makefiletarget + ".manifest"); + if (MODE_PHPIZE) { + MFO.WriteLine("$(BUILD_DIR)\\" + manifest_name + ": " + PHP_DIR + "\\build\\default.manifest"); + MFO.WriteLine("\t@copy " + PHP_DIR + "\\build\\default.manifest $(BUILD_DIR)\\" + makefiletarget + ".manifest"); + } else { + MFO.WriteLine("$(BUILD_DIR)\\" + manifest_name + ": win32\\build\\default.manifest"); + MFO.WriteLine("\t@copy $(PHP_SRC_DIR)\\win32\\build\\default.manifest $(BUILD_DIR)\\" + makefiletarget + ".manifest"); + } return manifest_name; }