backout -r2827 and add correct fix

diff --git a/auto/configure b/auto/configure
index 9a72db42f62fae96748666ee1e53ebb7b803b5c4..5e9c262bdcc7037f4e45ff1e38b90ad6c68481bd 100755 (executable)
--- a/auto/configure
+++ b/auto/configure
@@ -31,6 +31,12 @@ if test -z "$NGX_PLATFORM"; then
 
     NGX_PLATFORM="$NGX_SYSTEM:$NGX_RELEASE:$NGX_MACHINE";
 
+    case "$NGX_SYSTEM" in
+        MINGW32_*)
+            NGX_PLATFORM=win32
+        ;;
+    esac
+
 else
     echo "building for $NGX_PLATFORM"
     NGX_SYSTEM=$NGX_PLATFORM

diff --git a/auto/os/conf b/auto/os/conf
index 9bd5ee3c3cab871f754068e3809d0b641d0470a5..f4d08cb423d06f257405cebbac803271a4579ec7 100644 (file)
--- a/auto/os/conf
+++ b/auto/os/conf
@@ -22,7 +22,7 @@ case "$NGX_PLATFORM" in
         . auto/os/darwin
     ;;
 
-    win32 | MINGW32_* )
+    win32)
         . auto/os/win32
     ;;