From 0f79797be4d0495dfe09c6c47d1f53bd5cd23210 Mon Sep 17 00:00:00 2001
From: David Rosca <nowrep@gmail.com>
Date: Wed, 23 Apr 2014 08:33:58 +0200
Subject: [PATCH] [Build] Correctly choose /usr/lib/i386-linux-gnu as LIBDIR on
 32b Debian

QMAKE_HOST.arch is empty on x86
---
 src/defines.pri | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/defines.pri b/src/defines.pri
index 46edb6b4d..9ed2f118d 100644
--- a/src/defines.pri
+++ b/src/defines.pri
@@ -84,9 +84,7 @@ d_disable_updates_check = $$(DISABLE_UPDATES_CHECK)
 
 equals(d_no_system_datapath, "true") { DEFINES *= NO_SYSTEM_DATAPATH }
 equals(d_use_webgl, "true") { DEFINES *= USE_WEBGL }
-win32-msvc* {
-    equals(d_w7api, "true") { DEFINES *= W7API }
-}
+win32-msvc*:equals(d_w7api, "true") { DEFINES *= W7API }
 equals(d_kde, "true") { DEFINES *= KDE_INTEGRATION }
 equals(d_kde_integration, "true") { DEFINES *= KDE_INTEGRATION }
 equals(d_gnome_integration, "true") { DEFINES *= GNOME_INTEGRATION }
@@ -102,8 +100,13 @@ equals(d_disable_updates_check, "true") { DEFINES *= DISABLE_UPDATES_CHECK }
     x64libpath = /usr/lib/x86_64-linux-gnu
     system_lib_path = /usr/lib
 
-    contains(QMAKE_HOST.arch, x86):exists($$x86libpath) system_lib_path = $$x86libpath
-    contains(QMAKE_HOST.arch, x86_64):exists($$x64libpath) system_lib_path = $$x64libpath
+    # QMAKE_HOST.arch is empty on x86
+    contains(QMAKE_HOST.arch, x86_64) {
+        exists($$x64libpath): system_lib_path = $$x64libpath
+    }
+    else {
+        exists($$x86libpath): system_lib_path = $$x86libpath
+    }
 
     d_prefix = $$(QUPZILLA_PREFIX)
     binary_folder = /usr/bin