com php-src: fix nmake snap when ext name is different in target dll: win32/build/confutils.js
| From: | Anatol Belski | Date: | Mon, 21 Jul 2014 12:45:49 +0000 |
| Subject: | com php-src: fix nmake snap when ext name is different in target dll: win32/build/confutils.js | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-79544@lists.php.net to get a copy of this message | ||
Commit: dc3a5d783f92c63c1c2645b542d5f5487f3bd952
Author: Anatol Belski <ab@php.net> Mon, 21 Jul 2014 14:45:49 +0200
Parents: 0678dc8d912435d27b1c5c00634c1db2b6581ab0
Branches: PHP-5.4 PHP-5.5 PHP-5.6 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=dc3a5d783f92c63c1c2645b542d5f5487f3bd952
Log:
fix nmake snap when ext name is different in target dll
Changed paths:
M win32/build/confutils.js
Diff:
diff --git a/win32/build/confutils.js b/win32/build/confutils.js
index 5a13494..8da7604 100644
--- a/win32/build/confutils.js
+++ b/win32/build/confutils.js
@@ -1958,11 +1958,14 @@ function generate_makefile()
} else {
MF.WriteBlankLines(1);
MF.WriteLine("build-ext-libs:");
+ MF.WriteLine(" @if not exist $(BUILD_DIR_DEV)\\lib mkdir $(BUILD_DIR_DEV)\\lib
>nul");
for (var i in extensions_enabled) {
- var lib = "php_" + extensions_enabled[i][0] + ".lib";
+ var lib;
+
+ lib = "php_" + extensions_enabled[i][0] + "*.lib";
if ('shared' == extensions_enabled[i][1]) {
- MF.WriteLine(" @copy $(BUILD_DIR)\\" + lib + " $(BUILD_DIR_DEV)\\lib");
+ MF.WriteLine(" @if exist $(BUILD_DIR)\\" + lib + " copy $(BUILD_DIR)\\" +
lib + " $(BUILD_DIR_DEV)\\lib");
}
}
}