com php-src: fix phpize mode for manifest embedding: win32/build/confutils.js
| From: | Anatol Belski | Date: | Sun, 31 May 2015 21:03:47 +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-87025@lists.php.net to get a copy of this message | ||
Commit: 6fea2f1dd7cc050062c50638c551b51e60844f5c
Author: Anatol Belski <ab@php.net> Sun, 31 May 2015 23:03:47 +0200
Parents: c1401ad7b6948248ce8c9a33f1acbc706baae923
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=6fea2f1dd7cc050062c50638c551b51e60844f5c
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 35c546b..121f0c2 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;
}