--- qt-3.3.8b-fixedlink.old/config.tests/x11/xfreetype.test
+++ qt-3.3.8b-fixedlink/config.tests/x11/xfreetype.test
@@ -36,7 +36,7 @@
 
 # check for the Xft library
 XDIRS=`sed -n -e '/^QMAKE_LIBDIR_X11[	]*=/ { s/[^=]*=[	 ]*//; s/-L/ /g; p; }' $XCONFIG`
-LIBDIRS="$IN_LIBDIRS $XDIRS /usr/shlib /usr/lib /lib"
+LIBDIRS="__META_SYSTREE__/lib $IN_LIBDIRS $XDIRS"
 F=
 LIBS="Xft2 Xft"
 for LIB in $LIBS; do
@@ -62,7 +62,7 @@
 XFT_H=
 if [ "$XFT" = "yes" ]; then
     XDIRS=`sed -n -e '/^QMAKE_INCDIR_X11[	]*=/ { s/[^=]*=[	 ]*//; s/-I/ /g; p; }' $XCONFIG`
-    INCDIRS="$IN_INCDIRS $XDIRS /usr/include /include"
+    INCDIRS="__META_SYSTREE__/include $IN_INCDIRS $XDIRS"
     F=
     for INCDIR in $INCDIRS; do
 	INCS="X11/Xft/Xft2.h X11/Xft/Xft.h"
@@ -98,7 +98,7 @@
 if [ "$XFT" = "yes" ] && [ "$XFT2" = "no" ]; then
     INC="X11/Xft/XftFreetype.h"
     XDIRS=`sed -n -e '/^QMAKE_INCDIR_X11[	]*=/ { s/[^=]*=[	 ]*//; s/-I/ /g; p; }' $XCONFIG`
-    INCDIRS="$IN_INCDIRS $XDIRS /usr/include /include"
+    INCDIRS="__META_SYSTREE__/include $IN_INCDIRS $XDIRS"
     F=
     for INCDIR in $INCDIRS; do
 	if [ -f $INCDIR/$INC ]; then
@@ -119,7 +119,11 @@
     INC="freetype2/freetype/freetype.h"
     XDIRS=`sed -n -e '/^QMAKE_INCDIR_X11[	]*=/ { s/[^=]*=[	 ]*//; s/-I/ /g; p; }' $XCONFIG`
     LDIRS=`sed -n -e '/^QMAKE_INCDIR[	]*=/ { s/[^=]*=[	 ]*//; s/-I/ /g; p; }' $XCONFIG`
-    INCDIRS="$IN_INCDIRS $XDIRS $LDIRS /usr/include /include"
+
+    INCDIRS="__META_PRODTREE__/freetype2/include \
+__META_SYSTREE__/include \
+$IN_INCDIRS $XDIRS $LDIRS"
+
     F=
     for INCDIR in $INCDIRS; do
 	if [ -f $INCDIR/$INC ]; then
@@ -151,7 +155,7 @@
     INC="fontconfig/fontconfig.h"
     XDIRS=`sed -n -e '/^QMAKE_INCDIR_X11[	]*=/ { s/[^=]*=[	 ]*//; s/-I/ /g; p; }' $XCONFIG`
     LDIRS=`sed -n -e '/^QMAKE_INCDIR[	]*=/ { s/[^=]*=[	 ]*//; s/-I/ /g; p; }' $XCONFIG`
-    INCDIRS="$IN_INCDIRS $XDIRS $LDIRS /usr/include /include"
+    INCDIRS="__META_SYSTREE__/include $IN_INCDIRS $XDIRS $LDIRS"
     F=
     for INCDIR in $INCDIRS; do
 	if [ -f $INCDIR/$INC ]; then