com php-src: Fix `nmake install` fails when there are no shared extensions: win32/build/Makefile
| From: | Anatol Belski | Date: | Thu, 31 Aug 2017 18:32:36 +0000 |
| Subject: | com php-src: Fix `nmake install` fails when there are no shared extensions: win32/build/Makefile | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-99214@lists.php.net to get a copy of this message | ||
Commit: 2e77f5eed3740f61620d88619deebe2999ddc774
Author: Dylan K. Taylor <odigiman@gmail.com> Thu, 31 Aug 2017 15:04:45 +0100
Committer: Anatol Belski <ab@php.net> Thu, 31 Aug 2017 20:32:36 +0200
Parents: 4e9c3e9396de9dab4faac9e24bc019958b383d66
Branches: PHP-7.0 PHP-7.1 PHP-7.2 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=2e77f5eed3740f61620d88619deebe2999ddc774
Log:
Fix
nmake install fails when there are no shared extensions
check for existence instead of muting everything
check for exe existence before trying to copy
Changed paths:
M win32/build/Makefile
Diff:
diff --git a/win32/build/Makefile b/win32/build/Makefile
index 41f7420..e21099f 100644
--- a/win32/build/Makefile
+++ b/win32/build/Makefile
@@ -242,9 +242,9 @@ really-install:
@if not exist $(PHP_PREFIX) mkdir $(PHP_PREFIX)
@if not exist $(PHP_PREFIX)\ext mkdir $(PHP_PREFIX)\ext
@echo Installing files under $(PHP_PREFIX)
- @copy $(BUILD_DIR)\*.exe $(PHP_PREFIX) /y >nul
- @copy $(BUILD_DIR)\php_*.dll $(PHP_PREFIX)\ext /y >nul
- dir /b $(BUILD_DIR)\php_*.dll > $(BUILD_DIR)\extension_dlls.txt
+ @if exist $(BUILD_DIR)\*.exe copy $(BUILD_DIR)\*.exe $(PHP_PREFIX) /y >nul
+ @touch $(BUILD_DIR)\extension_dlls.txt
+ @if exist $(BUILD_DIR)\php_*.dll copy $(BUILD_DIR)\php_*.dll $(PHP_PREFIX)\ext /y >nul &
dir /b $(BUILD_DIR)\php_*.dll > $(BUILD_DIR)\extension_dlls.txt
@xcopy $(BUILD_DIR)\*.dll /exclude:$(BUILD_DIR)\extension_dlls.txt $(PHP_PREFIX) /y >nul
@echo Registering event source with syslog (requires admin rights)
@echo It's okay for this step to fail: