Skip to content

Commit 1f977d2

Browse files
committed
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0: Fix `nmake install` fails when there are no shared extensions
2 parents 020d3de + 2e77f5e commit 1f977d2

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

win32/build/Makefile

+3-3
Original file line numberDiff line numberDiff line change
@@ -242,9 +242,9 @@ really-install:
242242
@if not exist $(PHP_PREFIX) mkdir $(PHP_PREFIX)
243243
@if not exist $(PHP_PREFIX)\ext mkdir $(PHP_PREFIX)\ext
244244
@echo Installing files under $(PHP_PREFIX)
245-
@copy $(BUILD_DIR)\*.exe $(PHP_PREFIX) /y >nul
246-
@copy $(BUILD_DIR)\php_*.dll $(PHP_PREFIX)\ext /y >nul
247-
dir /b $(BUILD_DIR)\php_*.dll > $(BUILD_DIR)\extension_dlls.txt
245+
@if exist $(BUILD_DIR)\*.exe copy $(BUILD_DIR)\*.exe $(PHP_PREFIX) /y >nul
246+
@touch $(BUILD_DIR)\extension_dlls.txt
247+
@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
248248
@xcopy $(BUILD_DIR)\*.dll /exclude:$(BUILD_DIR)\extension_dlls.txt $(PHP_PREFIX) /y >nul
249249
@echo Registering event source with syslog (requires admin rights)
250250
@echo It's okay for this step to fail:

0 commit comments

Comments
 (0)