diff options
| author | Anatol Belski <ab@php.net> | 2017-08-31 20:33:31 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2017-08-31 20:33:31 +0200 |
| commit | 1f977d2377d47aca02b6bdd946e53f14f5d7c7fe (patch) | |
| tree | d64f9f73ebb0f12954d60ea585d61a4cf906ae29 | |
| parent | 020d3decb392f394902db8f1fa74e0c07d83c2ad (diff) | |
| parent | 2e77f5eed3740f61620d88619deebe2999ddc774 (diff) | |
| download | php-git-1f977d2377d47aca02b6bdd946e53f14f5d7c7fe.tar.gz | |
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fix `nmake install` fails when there are no shared extensions
| -rw-r--r-- | win32/build/Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/win32/build/Makefile b/win32/build/Makefile index 41f7420fa6..e21099fa66 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: |