diff options
| author | Anatol Belski <ab@php.net> | 2016-02-01 15:42:32 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2016-02-01 15:42:32 +0100 |
| commit | 2764586c6d69225fdc6663b32d4047881a903d7a (patch) | |
| tree | 3d1aaacac6d4f9435dbfc0ba4decba49b7b21758 /win32 | |
| parent | a5474c7ac05f339e248569a3d897f059c2778b92 (diff) | |
| download | php-git-2764586c6d69225fdc6663b32d4047881a903d7a.tar.gz | |
fix extensions path for nmake install
Diffstat (limited to 'win32')
| -rw-r--r-- | win32/build/Makefile | 5 | ||||
| -rw-r--r-- | win32/build/config.w32.h.in | 2 | ||||
| -rw-r--r-- | win32/build/confutils.js | 3 |
3 files changed, 7 insertions, 3 deletions
diff --git a/win32/build/Makefile b/win32/build/Makefile index 19ee82e7b9..06f8ef35d5 100644 --- a/win32/build/Makefile +++ b/win32/build/Makefile @@ -211,9 +211,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 b2ee6f1958..fd02cc7878 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 355327156d..91af62aa5c 100644 --- a/win32/build/confutils.js +++ b/win32/build/confutils.js @@ -2069,7 +2069,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); |