From 0341f7a1ac287dbe5ea189ad90df967b399b8393 Mon Sep 17 00:00:00 2001
From: Roland Winklmeier <Roland.M.Winklmeier@gmail.com>
Date: Mon, 19 Jan 2015 11:16:34 +0100
Subject: [PATCH] Fix missed issues in the Linux build system

---
 build.pri     | 2 +-
 externals.pri | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/build.pri b/build.pri
index 11730f10e..15a669f04 100644
--- a/build.pri
+++ b/build.pri
@@ -44,7 +44,7 @@ win32-g++ {
 }
 linux-g++ {
     GCC64 = $$system($$QMAKE_CXX -Q --help=target | grep m64)
-    contains(MINGW64,[enabled]) {
+    contains(GCC64,[enabled]) {
         WORD_SIZE = 64
     }
     else {
diff --git a/externals.pri b/externals.pri
index c2ada51d1..abe21ce2f 100644
--- a/externals.pri
+++ b/externals.pri
@@ -42,8 +42,8 @@ win32-g++ {
     LIBS += -luser32
 }
 linux-g++* {
-    equals(WORD_SIZE,64): LIBS *= -L$$EXTERNALDIR/linux64/lib
-    equals(WORD_SIZE,32): LIBS *= -L$$EXTERNALDIR/linux32/lib
+    equals(WORD_SIZE,64): LIBS *= -L$$EXTERNALDIR/linux-g++/lib64
+    equals(WORD_SIZE,32): LIBS *= -L$$EXTERNALDIR/linux-g++/lib32
 }
 macx-clang {
     INCLUDEPATH *= $$EXTERNALDIR/macx-clang/include