--- configure.old	2008-12-07 01:22:57.000000000 +0100
+++ configure	2008-12-07 01:32:26.000000000 +0100
@@ -8,7 +8,7 @@ if test "`uname`" = "SunOS"; then
 	LDFLAGS="$LDFLAGS -L/usr/X/lib"
 	CFLAGS="$CFLAGS I/usr/include/X11"
 else
-	X11_PATH="/usr/X11R6"
+	X11_PATH="/usr"
 fi
 if test -e "$X11_PATH"; then
 	echo $X11_PATH
@@ -20,7 +20,8 @@ else
 fi
 
 CFLAGS="$CFLAGS -I$X11_PATH/include"
-LDFLAGS="$LDFLAGS -L$X11_PATH/lib -lX11"
+LDFLAGS="$LDFLAGS -L$X11_PATH/lib"
+LIBS="-lX11"
 
 if test "_$CC" = "_"; then
 	CC="cc"
@@ -41,7 +42,7 @@ echo -n "checking for X11/xpm.h... "
 xpm=no
 if test -e "$X11_PATH/include/X11/xpm.h"; then
 	echo yes
-	LDFLAGS="$LDFLAGS -lXpm"
+	LIBS="${LIBS} -lXpm"
 	CFLAGS="$CFLAGS -DHAVE_XPM"
 	xpm=yes
 else
@@ -52,8 +53,8 @@ echo -n "checking for X11/Xft/Xft.h... "
 xft=no
 if test -e "$X11_PATH/include/X11/Xft/Xft.h"; then
 	echo yes
-	LDFLAGS="$LDFLAGS -lXft"
-	CFLAGS="$CFLAGS -DXFT"
+	LIBS="${LIBS} -lXft"
+	CFLAGS="$CFLAGS -DXFT -I/usr/include/freetype2"
 	xft=yes
 else
 	echo no
@@ -72,16 +73,16 @@ echo -n "creating Makefile... "
 echo CC="$CC" > Makefile
 echo CFLAGS="$CFLAGS" >> Makefile
 echo LDFLAGS="$LDFLAGS" >> Makefile
+echo LIBS="${LIBS}" >> Makefile
 echo PROGNAME="$PROGNAME" >> Makefile
+echo BINDIR="${BINDIR}" >> Makefile
 echo >> Makefile
 echo $\(PROGNAME\): Makefile fspanel.c fspanel.h icon.xpm >> Makefile
-echo \	$\(CC\) $\(CFLAGS\) $\(LDFLAGS\) fspanel.c -o $\(PROGNAME\) >> Makefile
-echo \	@ls -l $\(PROGNAME\) >> Makefile
+echo \	$\(CC\) $\(CFLAGS\) $\(LDFLAGS\) fspanel.c -o $\(PROGNAME\) $\(LIBS\) >> Makefile
 echo \	strip $\(PROGNAME\) >> Makefile
-echo \	@ls -l $\(PROGNAME\) >> Makefile
 echo >> Makefile
 echo install: >> Makefile
-echo \	install $\(PROGNAME\) /usr/local/bin >> Makefile
+echo \	install -D $\(PROGNAME\) $\(BINDIR\)/$\(PROGNAME\) >> Makefile
 
 echo done
 echo