fix extensions path for nmake install

diff --git a/win32/build/Makefile b/win32/build/Makefile
index 19ee82e7b983b90a9777220b7ab7b7502608d6f3..06f8ef35d5088dafd5761b629ea5e50707b6f506 100644 (file)
--- 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 b2ee6f195864d370139f6b02b215baeacb681355..fd02cc787854d85aa7b2f8624175218fdb63cc2d 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 355327156dee8e6781e08d026c3d611303b9a0de..91af62aa5cb72398bec424390c5b9f9abadcf525 100644 (file)
--- 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);