diff --git a/m4/moo-pygtk.m4 b/m4/moo-pygtk.m4
index b958ea2f..20a77196 100644
--- a/m4/moo-pygtk.m4
+++ b/m4/moo-pygtk.m4
@@ -20,9 +20,6 @@ AC_DEFUN([_MOO_AC_PYGTK_CODEGEN],[
         fi
     ])
 
-    PYGTK_CODEGEN_DIR=`$PKG_CONFIG --variable=codegendir pygtk-2.0`
-    AC_SUBST(PYGTK_CODEGEN_DIR)
-
     if test x$MOO_USE_CUSTOM_CODEGEN != xyes; then
         AC_MSG_NOTICE([pygtk codegen dir: $PYGTK_CODEGEN_DIR])
     fi
@@ -66,7 +63,7 @@ AC_DEFUN([_MOO_AC_CHECK_PYGTK_MINGW],[
         AC_SUBST(PYGTK_CFLAGS)
         PYGTK_DEFS_DIR=$PYTHON_PREFIX/share/pygtk/2.0/defs
         AC_SUBST(PYGTK_DEFS_DIR)
-        PYGTK_CODEGEN_DIR=`$PKG_CONFIG --variable=codegendir pygtk-2.0`
+        PYGTK_CODEGEN_DIR=$PYTHON_PREFIX/share/pygtk/2.0/codegen
         AC_SUBST(PYGTK_CODEGEN_DIR)
         AC_MSG_NOTICE([pygtk defs dir: $PYGTK_DEFS_DIR])
         $2
@@ -109,6 +106,8 @@ AC_DEFUN([_MOO_AC_CHECK_PYGTK_UNIX],[
             $2
             PYGTK_DEFS_DIR=`$PKG_CONFIG --variable=defsdir pygtk-2.0`
             AC_SUBST(PYGTK_DEFS_DIR)
+            PYGTK_CODEGEN_DIR=`$PKG_CONFIG --variable=codegendir pygtk-2.0`
+            AC_SUBST(PYGTK_CODEGEN_DIR)
             AC_MSG_NOTICE([pygtk defs dir: $PYGTK_DEFS_DIR])
             _MOO_AC_PYGTK_CODEGEN
         ],[
diff --git a/mingw-configure b/mingw-configure
index b7fd1d12..aff27236 100755
--- a/mingw-configure
+++ b/mingw-configure
@@ -9,7 +9,7 @@ export PKG_CONFIG_LIBDIR=$GTK_PREFIX/lib/pkgconfig
 ############################################################################
 
 if [ x`basename $0` = xfake-pkg-config ]; then
-    if [ $1 -a $1 = "--atleast-pkgconfig-version" ]; then
+    if [ $1 -a "$1" = "--atleast-pkgconfig-version" ]; then
         exec /usr/bin/pkg-config --atleast-pkgconfig-version $2
     else
         exec /usr/bin/pkg-config --define-variable=prefix=$GTK_PREFIX $*