summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDylan K. Taylor <odigiman@gmail.com>2017-08-31 15:04:45 +0100
committerAnatol Belski <ab@php.net>2017-08-31 20:32:36 +0200
commit2e77f5eed3740f61620d88619deebe2999ddc774 (patch)
tree435609a4b3083fb6686b1f7319033873912d95bd
parent4e9c3e9396de9dab4faac9e24bc019958b383d66 (diff)
downloadphp-git-2e77f5eed3740f61620d88619deebe2999ddc774.tar.gz
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
-rw-r--r--win32/build/Makefile6
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: