diff options
| author | Anatol Belski <ab@php.net> | 2015-05-31 23:01:21 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2015-05-31 23:01:21 +0200 |
| commit | f029a2856b40dfb9093b85414c3e7419c43516f4 (patch) | |
| tree | 810e6203eaebe8e18c500ec52cfa8aeeb964dd26 /win32 | |
| parent | b24fedbd24cef13dab0198f154db4fdaf3c9b3eb (diff) | |
| download | php-git-f029a2856b40dfb9093b85414c3e7419c43516f4.tar.gz | |
fix phpize mode for manifest embedding
Diffstat (limited to 'win32')
| -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 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;
}
|