From: Anatol Belski Date: Sun, 31 May 2015 21:03:47 +0000 (+0200) Subject: fix phpize mode for manifest embedding X-Git-Tag: php-7.0.0alpha1~62 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6fea2f1dd7cc050062c50638c551b51e60844f5c;p=php fix phpize mode for manifest embedding --- diff --git a/win32/build/confutils.js b/win32/build/confutils.js index 35c546b487..121f0c2998 100644 --- a/win32/build/confutils.js +++ b/win32/build/confutils.js @@ -941,8 +941,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; }