Mine

diff --git a/mythtv/configure b/mythtv/configure
index facea94..154c5da 100755
--- a/mythtv/configure
+++ b/mythtv/configure
@@ -3731,14 +3731,6 @@ fi
 
 echo "#endif /* FFMPEG_CONFIG_H */" >> $TMPH
 
-cat <<EOF >> $MYTH_CONFIG_MAK
-# HACK: If Qt 4 and MythTV's installed library dirs are the same, remove the
-#       -L from early in the link line, to ignore any old installed libmyth*
-# Note: Qt uses QMAKE_INCDIR_QT to build an absolute path for include
-#       directories, it cannot be modified.
-QMAKE_LIBDIR_QT -= $libdir
-LATE_LIBS            += -L$libdir
-EOF
 
 diff $TMPH $MYTH_CONFIG_H >/dev/null 2>&1
 if test $? -ne 0 ; then
diff --git a/mythtv/libs/libmyth/libmyth.pro b/mythtv/libs/libmyth/libmyth.pro
index 7b73b3d..934f6ae 100644
--- a/mythtv/libs/libmyth/libmyth.pro
+++ b/mythtv/libs/libmyth/libmyth.pro
@@ -201,5 +201,3 @@ contains( CONFIG_LIBFFTW3, yes ) {
 }
 
 include ( ../libs-targetfix.pro )
-
-LIBS += $$LATE_LIBS
diff --git a/mythtv/libs/libmythdb/libmythdb.pro b/mythtv/libs/libmythdb/libmythdb.pro
index da4e99e..c9a883b 100644
--- a/mythtv/libs/libmythdb/libmythdb.pro
+++ b/mythtv/libs/libmythdb/libmythdb.pro
@@ -52,5 +52,3 @@ mingw:LIBS += -lpthread -lws2_32
 QT += sql network
 
 include ( ../libs-targetfix.pro )
-
-LIBS += $$LATE_LIBS
diff --git a/mythtv/libs/libmythtv/libmythtv.pro b/mythtv/libs/libmythtv/libmythtv.pro
index b75a991..4c61cce 100644
--- a/mythtv/libs/libmythtv/libmythtv.pro
+++ b/mythtv/libs/libmythtv/libmythtv.pro
@@ -541,5 +541,3 @@ inc.files = programinfo.h remoteutil.h recordingtypes.h
 INSTALLS += inc
 
 include ( ../libs-targetfix.pro )
-
-LIBS += $$LATE_LIBS
diff --git a/mythtv/libs/libmythui/libmythui.pro b/mythtv/libs/libmythui/libmythui.pro
index d893d00..fb279e1 100644
--- a/mythtv/libs/libmythui/libmythui.pro
+++ b/mythtv/libs/libmythui/libmythui.pro
@@ -140,4 +140,3 @@ use_hidesyms {
 
 include ( ../libs-targetfix.pro )
 
-LIBS += $$LATE_LIBS
diff --git a/mythtv/libs/libmythupnp/libmythupnp.pro b/mythtv/libs/libmythupnp/libmythupnp.pro
index 405928b..03716ec 100644
--- a/mythtv/libs/libmythupnp/libmythupnp.pro
+++ b/mythtv/libs/libmythupnp/libmythupnp.pro
@@ -72,4 +72,3 @@ QT += network xml sql
 
 include ( ../libs-targetfix.pro )
 
-LIBS += $$LATE_LIBS
diff --git a/mythtv/programs/programs-libs.pro b/mythtv/programs/programs-libs.pro
index ca98317..466ee6f 100644
--- a/mythtv/programs/programs-libs.pro
+++ b/mythtv/programs/programs-libs.pro
@@ -43,4 +43,4 @@ CONFIG += opengl
 macx:using_firewire:using_backend:LIBS += -F$${CONFIG_MAC_AVC} -framework AVCVideoServices
 macx:using_dvdv:LIBS += -lobjc
 
-LIBS += $$EXTRA_LIBS $$LATE_LIBS
+LIBS += $$EXTRA_LIBS
diff --git a/mythtv/settings.pro b/mythtv/settings.pro
index 3be38f3..ecd8030 100644
--- a/mythtv/settings.pro
+++ b/mythtv/settings.pro
@@ -1,5 +1,13 @@
 CONFIG += $$CCONFIG
 
+
+# HACK: qmake adds QMAKE_LIBDIR_QT as first library dir
+#       If previous MythTV's installed libraries are installed in the same dir
+#       linking the libraries will fail. This ensures that the QT library dir
+#       comes after the build library dirs
+for(qtlibdir, QMAKE_LIBDIR_QT):LATE_LIBS += -L$${qtlibdir}
+QMAKE_LIBDIR_QT =
+
 # Where binaries, includes and runtime assets are installed by 'make install'
 isEmpty( PREFIX ) {
     PREFIX = /usr/local
@@ -119,7 +127,9 @@ ALSA_LIBS = $$CONFIG_AUDIO_ALSA_LIBS
 ARTS_LIBS = $$CONFIG_AUDIO_ARTS_LIBS
 JACK_LIBS = $$CONFIG_AUDIO_JACK_LIBS
 
-EXTRA_LIBS = $$FREETYPE_LIBS -lmp3lame
+
+EXTRA_LIBS  = $$LATE_LIBS
+EXTRA_LIBS += $$FREETYPE_LIBS -lmp3lame
 EXTRA_LIBS += $$CONFIG_FIREWIRE_LIBS
 EXTRA_LIBS += $$CONFIG_DIRECTFB_LIBS