com php-src: fix phpize mode for manifest embedding: win32/build/confutils.js
| From: | Anatol Belski | Date: | Sun, 31 May 2015 21:01:21 +0000 |
| Subject: | com php-src: fix phpize mode for manifest embedding: win32/build/confutils.js | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-87023@lists.php.net to get a copy of this message | ||
Commit: f029a2856b40dfb9093b85414c3e7419c43516f4
Author: Anatol Belski <ab@php.net> Sun, 31 May 2015 23:01:21 +0200
Parents: b24fedbd24cef13dab0198f154db4fdaf3c9b3eb
Branches: PHP-5.5 PHP-5.6 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=f029a2856b40dfb9093b85414c3e7419c43516f4
Log:
fix phpize mode for manifest embedding
Changed paths:
M win32/build/confutils.js
Diff:
diff --git a/win32/build/confutils.js b/win32/build/confutils.js
index 9c68a97..5c090cf 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;
}