use MINGW_SYSROOT consistently

Restore all cases to expect /mingw/ included in the path.

configure.ac

@@ -5315,8 +5315,8 @@ dnl ===================================================================
 if test "$WITH_MINGW" = "yes"; then
     AC_MSG_CHECKING([for MinGW sysroot])
     sysroot=`$CC -print-sysroot`
-    AS_IF([test -d "$sysroot"],
-          [MINGW_SYSROOT="$sysroot"
+    AS_IF([test -d "$sysroot"/mingw],
+          [MINGW_SYSROOT="$sysroot"/mingw
            AC_MSG_RESULT([$MINGW_SYSROOT])],
           [AC_MSG_RESULT([not found])
            AC_MSG_ERROR([cannot determine MinGW sysroot])])
@@ -7529,12 +7529,12 @@ if test $enable_python = system; then
         dnl How to find out the cross-compilation Python installation path?
         dnl Let's hardocode what we know for different distributions for now...
         for python_version in 2.6; do
-            if test -f ${MINGW_SYSROOT}/mingw/include/python${python_version}/Python.h; then
-                PYTHON_CFLAGS="-I${MINGW_SYSROOT}/mingw/include/python$python_version"
-                PYTHON_LIBS="-L${MINGW_SYSROOT}/mingw/lib -lpython$python_version $python_libs"
+            if test -f ${MINGW_SYSROOT}/include/python${python_version}/Python.h; then
+                PYTHON_CFLAGS="-I${MINGW_SYSROOT}/include/python$python_version"
+                PYTHON_LIBS="-L${MINGW_SYSROOT}/lib -lpython$python_version $python_libs"
                 AC_MSG_CHECKING([for python.exe])
-                AS_IF([test -f "$MINGW_SYSROOT/mingw/bin/python.exe"],
-                      [AC_MSG_RESULT([$MINGW_SYSROOT/mingw/bin/python.exe])
+                AS_IF([test -f "$MINGW_SYSROOT/bin/python.exe"],
+                      [AC_MSG_RESULT([$MINGW_SYSROOT/bin/python.exe])
                        MINGW_PYTHON_EXE=python.exe],
                       [AC_MSG_RESULT([not found])
                        AC_MSG_ERROR([could not find python.exe])])

external/Package_mingw_dlls.mk

@@ -7,7 +7,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_Package_Package,mingw_dlls,$(MINGW_SYSROOT)/mingw/bin))
+$(eval $(call gb_Package_Package,mingw_dlls,$(MINGW_SYSROOT)/bin))
 
 $(eval $(call gb_Package_add_files,mingw_dlls,bin,\
     $(MINGW_BOOST_DATE_TIME_DLL) \

m4/mingw.m4

@@ -47,7 +47,7 @@ AC_DEFUN([libo_MINGW_CHECK_DLL],
 [AC_ARG_VAR([MINGW_][$1][_DLL],[output variable containing the found dll name])dnl
 
 if test -n "$WITH_MINGW"; then
-    _libo_mingw_dlldir="[$MINGW_SYSROOT]"/mingw/bin
+    _libo_mingw_dlldir="[$MINGW_SYSROOT]"/bin
     _libo_mingw_dllname=
     AC_MSG_CHECKING([for $2 dll])