com php-src: fix extensions path for nmake install: win32/build/Makefile win32/build/config.w32.h.in win32/build/confutils.js

Commit: a01fd45d15b543cdaf686202bc415099f2729474 Author: Anatol Belski <ab@php.net> Mon, 1 Feb 2016 15:38:53 +0100 Parents: 00788f9cfbdca9b52b148b7219c9ba05cdc6e130 Branches: PHP-5.6 PHP-7.0 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=a01fd45d15b543cdaf686202bc415099f2729474 Log: fix extensions path for nmake install Changed paths: M win32/build/Makefile M win32/build/config.w32.h.in M win32/build/confutils.js Diff: diff --git a/win32/build/Makefile b/win32/build/Makefile index 568b9e4..224ef2a 100644 --- a/win32/build/Makefile +++ b/win32/build/Makefile @@ -207,9 +207,12 @@ install-sdk: build-devel 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)\*.dll $(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 + @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: -$(PHP_PREFIX)\php.exe -n -dextension_dir=$(PHP_PREFIX) win32/build/registersyslog.php $(PHP_PREFIX)\$(PHPDLL) diff --git a/win32/build/config.w32.h.in b/win32/build/config.w32.h.in index 9efdfde..760de88 100644 --- a/win32/build/config.w32.h.in +++ b/win32/build/config.w32.h.in @@ -15,7 +15,7 @@ #define PEAR_INSTALLDIR "@PREFIX@\\pear" #define PHP_BINDIR "@PREFIX@" #define PHP_DATADIR "@PREFIX@" -#define PHP_EXTENSION_DIR "@PREFIX@" +#define PHP_EXTENSION_DIR "@PREFIX@\\ext" #define PHP_INCLUDE_PATH ".;@PREFIX@\\pear" #define PHP_LIBDIR "@PREFIX@" #define PHP_LOCALSTATEDIR "@PREFIX@" diff --git a/win32/build/confutils.js b/win32/build/confutils.js index 649e216..9cb6820 100644 --- a/win32/build/confutils.js +++ b/win32/build/confutils.js @@ -2016,7 +2016,8 @@ function generate_makefile() var dll = "php_" + extensions_enabled[i][0] + ".dll"; MF.WriteLine(" @copy $(BUILD_DIR)\\" + lib + " $(BUILD_DIR_DEV)\\lib"); MF.WriteLine(" @if not exist $(PHP_PREFIX) mkdir $(PHP_PREFIX) >nul"); - MF.WriteLine(" @copy $(BUILD_DIR)\\" + dll + " $(PHP_PREFIX)"); + MF.WriteLine(" @if not exist $(PHP_PREFIX)\\ext mkdir $(PHP_PREFIX)\\ext >nul"); + MF.WriteLine(" @copy $(BUILD_DIR)\\" + dll + " $(PHP_PREFIX)\\ext"); } } else { MF.WriteBlankLines(1);