--- configure.orig	2012-12-04 12:06:33 UTC
+++ configure
@@ -13,10 +13,10 @@ OSLIBS_INET=""
 OSLIBS_DL=""
 OSLIBS_THREAD=""
 
-__cc=cc
-__cxx=c++
-__defprefix=""
-__prefix=""
+__cc=${CC}
+__cxx=${CXX}
+__defprefix="${PREFIX}"
+__prefix="${PREFIX}"
 __enable_debug=no
 __enable_png=yes
 __enable_gui=yes
@@ -344,8 +344,8 @@ LPNG_LIB  = $lpng_ldflags
 
 " >> Makefile
 
-	echo "CXXFLAGS += -Wall -O2 $OSDEFS $LPNG_DEFS $PLUGIN_DEFS $DEFS" >> Makefile
-	echo "CFLAGS   += -Wall -O2 $OSDEFS $LPNG_DEFS $PLUGIN_DEFS $DEFS" >> Makefile
+	echo "CXXFLAGS += -Wall $OSDEFS $LPNG_DEFS $PLUGIN_DEFS $DEFS" >> Makefile
+	echo "CFLAGS   += -Wall $OSDEFS $LPNG_DEFS $PLUGIN_DEFS $DEFS" >> Makefile
 
 	if test "$__enable_debug" = "yes" ; then
 		echo "# additional debug options" >> Makefile
@@ -491,7 +491,7 @@ else
 		fi
 	fi
 fi
-	echo "	lrelease -verbose qpxtool.pro" >> $mf
+	echo "	lrelease-qt4 -verbose qpxtool.pro" >> $mf
 
 	echo "
 clean: Makefile.qmake
@@ -846,7 +846,7 @@ case "$OSL" in
 		__libdir=$__prefix/lib
 		__plugindir=$__libdir/qpxtool
 		__incdir=$__prefix/include
-		__mandir=$__prefix/share/man
+		__mandir=$__prefix/man
 		;;
 	mingw32*)
 		__bindir=$__prefix