$OpenBSD: patch-configure,v 1.2 2005/07/26 05:45:08 alek Exp $
--- configure.orig	Sun Jul 10 16:54:15 2005
+++ configure	Mon Jul 25 21:52:27 2005
@@ -1,4 +1,4 @@
-#!/bin/sh
+#! /bin/sh
 #
 # $Id: patch-configure,v 1.2 2005/07/26 05:45:08 alek Exp $
 #
@@ -241,7 +241,7 @@ if test "$f_wizard" = YES; then
     echo "  QTDIR environment variable not set!"
     echo -n "  Checking for Qt..."
     for d in /usr/{lib,share,qt}/{qt-3,qt3,qt,qt*,3}; do
-      if test -d "$d/lib" -a -d "$d/include" -a -x "$d/bin/moc"; then
+      if test -d "$d/lib" -a -d "$d/include" -a -x ${MOC}; then
         QTDIR=$d
       fi
     done
@@ -264,10 +264,6 @@ if test "$f_wizard" = YES; then
       echo "QTDIR is set to $QTDIR, but include directory $QTDIR/include does not exist!"
       exit 2
     fi
-    if test ! -x "$QTDIR/bin/moc"; then
-      echo "QTDIR is set to $QTDIR, but the moc tool could not be found in $QTDIR/bin!"
-      exit 2
-    fi
     echo " headers $QTDIR/include,"
     echo "                     libraries $QTDIR/lib"  
     if test -n "`ls $QTDIR/lib/* | grep qt-mt`"; then
@@ -456,7 +452,7 @@ EOF
 fi
 if test "$f_wizard" = YES; then
   cat >> .tmakeconfig <<EOF
-TMAKE_MOC = $QTDIR/bin/moc
+TMAKE_MOC = ${MOC}
 EOF
 fi
 
@@ -482,17 +478,16 @@ EOF
      if test $i = Makefile.in; then
        echo "" >> $DST
        echo "all: src/version.cpp " >> $DST
-       echo "	\$(MAKE) -C qtools" >> $DST
-       echo "	\$(MAKE) -C libpng" >> $DST
-       echo "	\$(MAKE) -C libmd5" >> $DST
-       echo "	\$(MAKE) -C src" >> $DST
+       echo "	(cd qtools && \$(MAKE))" >> $DST
+       echo "	(cd libmd5 && \$(MAKE))" >> $DST
+       echo "	(cd src && \$(MAKE))" >> $DST
        if test $f_wizard = YES; then
-         echo "	\$(MAKE) -C addon/doxywizard" >> $DST
+         echo "	(cd addon/doxywizard && rm -rf obj && \$(MAKE))" >> $DST
        fi
        echo "" >> $DST
        echo "doxywizard_install:" >> $DST
        if test $f_wizard = YES; then
-         echo "	\$(MAKE) -C addon/doxywizard install" >> $DST
+         echo "	(cd addon/doxywizard && \$(MAKE) install)" >> $DST
        fi
        echo "" >> $DST
      fi