--- YaPIDE-0.1.1/configure.orig	2007-06-21 21:36:08.000000000 +1000
+++ YaPIDE-0.1.1/configure	2007-06-21 21:36:29.000000000 +1000
@@ -20,8 +20,8 @@
     exit -1
 fi
 
-QMAKE_TEST=`which qmake`
-if [ ! -f "$QMAKE_TEST" ]
+QMAKE=$QTDIR/bin/qmake
+if [ ! -f "$QMAKE" ]
 then
     echo "*******************************************************************************"
     echo " The qmake utility was not found. This package requires a correctly"
@@ -44,9 +44,9 @@
 echo "Creating Makefiles..." 
 
 
-qmake YaPIDE.pro -o Makefile 
+$QMAKE YaPIDE.pro -o Makefile 
 cd src
-qmake src.pro -o Makefile
+$QMAKE src.pro -o Makefile
 cd ..
 
 echo "Testing libraries & tools ..."
@@ -55,7 +55,7 @@
 echo "#include <stdio.h>" >> qttest.cpp
 echo "int main(int argc, char **argv) { fprintf( stderr, \"Found QT Version %s: \", QT_VERSION_STR );" >> qttest.cpp
 echo "if (QT_VERSION >= 300) return 0; else return -1; }" >> qttest.cpp
-g++ -I$QTDIR/include qttest.cpp
+$CXX -I$QTDIR/include qttest.cpp
 if ./a.out
 then
 echo "OK"