fix extensions path for nmake install

diff --git a/win32/build/Makefile b/win32/build/Makefile
index 568b9e42d7504b92824c82c3d38b92d4cd106c69..224ef2ae1ec21c39616ef67902062078c87d554b 100644 (file)
--- 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 9efdfdea3ea5739832d66bde8ba89ceca52c887d..760de88d7fdc134c94f82d5cb603b6f8a11aa453 100644 (file)
--- 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 649e216e669da525fa0f6dab466774bedb2474b0..9cb68201d6051a024ee7475d613a80494b1e3849 100644 (file)
--- 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";\r
                        MF.WriteLine("  @copy $(BUILD_DIR)\\" + lib + " $(BUILD_DIR_DEV)\\lib");\r
                        MF.WriteLine("  @if not exist $(PHP_PREFIX) mkdir $(PHP_PREFIX) >nul");\r
-                       MF.WriteLine("  @copy $(BUILD_DIR)\\" + dll + " $(PHP_PREFIX)");\r
+                       MF.WriteLine("  @if not exist $(PHP_PREFIX)\\ext mkdir $(PHP_PREFIX)\\ext >nul");\r
+                       MF.WriteLine("  @copy $(BUILD_DIR)\\" + dll + " $(PHP_PREFIX)\\ext");\r
                }\r
        } else {\r
                MF.WriteBlankLines(1);\r