diff options
| author | Anatol Belski <ab@php.net> | 2015-05-31 23:03:47 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2015-05-31 23:03:47 +0200 |
| commit | 6fea2f1dd7cc050062c50638c551b51e60844f5c (patch) | |
| tree | 5758bf168421a27fcacc9aa276cb1ac1f15f100c | |
| parent | c1401ad7b6948248ce8c9a33f1acbc706baae923 (diff) | |
| download | php-git-6fea2f1dd7cc050062c50638c551b51e60844f5c.tar.gz | |
fix phpize mode for manifest embedding
| -rw-r--r-- | win32/build/confutils.js | 9 |
1 files changed, 7 insertions, 2 deletions
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; } |