Under MinGW, path to MOC is bad

When having Qt built under DOS, but being used under MinGW and doing

$ make

The result is:
C:/msys/1.0/qt-win-opensource-src-4.3.4/bin\moc.exe ...
make: C:/msys/1.0/qt-win-opensource-src-4.3.4/binmoc.exe: Command not found

The expected result should be:
C:/msys/1.0/qt-win-opensource-src-4.3.4/bin/moc ...

An incorrect QMAKE_MOC value

A fix:

$ diff -u mkspecs/win32-g+/qmake.conf.orig mkspecs/win32-g+/qmake.conf
— mkspecs/win32-g++/qmake.conf.orig Wed Feb 20 04:34:58 2008
+++ mkspecs/win32-g++/qmake.conf Fri Apr 18 17:00:19 2008
@@ -81,6 +81,9 @@
QMAKE_MKDIR = mkdir
QMAKE_DEL_DIR = rmdir
QMAKE_CHK_DIR_EXISTS = test -d
+ QMAKE_MOC = $$[QT_INSTALL_BINS]/moc
+ QMAKE_UIC = $$[QT_INSTALL_BINS]/uic
+ QMAKE_IDC = $$[QT_INSTALL_BINS]/idc
} else {
QMAKE_COPY = copy /y
QMAKE_COPY_DIR = xcopy /s /q /y /i
@@ -89,11 +92,11 @@
QMAKE_MKDIR = mkdir
QMAKE_DEL_DIR = rmdir
QMAKE_CHK_DIR_EXISTS = if not exist
+ QMAKE_MOC = $$[QT_INSTALL_BINS]$${DIR_SEPARATOR}moc.exe
+ QMAKE_UIC = $$[QT_INSTALL_BINS]$${DIR_SEPARATOR}uic.exe
+ QMAKE_IDC = $$[QT_INSTALL_BINS]$${DIR_SEPARATOR}idc.exe
}

-QMAKE_MOC = $$[QT_INSTALL_BINS]$${DIR_SEPARATOR}moc.exe
-QMAKE_UIC = $$[QT_INSTALL_BINS]$${DIR_SEPARATOR}uic.exe
-QMAKE_IDC = $$[QT_INSTALL_BINS]$${DIR_SEPARATOR}idc.exe

QMAKE_IDL = midl
QMAKE_LIB = ar -ru