diff options
| author | Anatol Belski <ab@php.net> | 2017-08-31 20:34:41 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2017-08-31 20:34:41 +0200 |
| commit | 27644c14665cf6b7754bb8488a10ffc2306d7f07 (patch) | |
| tree | ce2a20b45f13fa208a169777f4964634be179330 /win32 | |
| parent | 1a116169e7978db21325d095c12d893a0cdef4bd (diff) | |
| parent | e7c1c86ceb8e8580ed3f4f171357e43b14d95c7b (diff) | |
| download | php-git-27644c14665cf6b7754bb8488a10ffc2306d7f07.tar.gz | |
Merge branch 'PHP-7.2'
* PHP-7.2:
Fix `nmake install` fails when there are no shared extensions
Diffstat (limited to 'win32')
| -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 69eaddec97..aa81443dd7 100644 --- a/win32/build/Makefile +++ b/win32/build/Makefile @@ -245,9 +245,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: |