From 7b34bad810c2daf5286571bd04ecd4ffc3acc80a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B8rgen=20Lind?= <jorgen.lind@nokia.com>
Date: Tue, 22 Mar 2011 12:49:23 +0100
Subject: [PATCH] Adding destination directory for wayland build

---
 src/3rdparty/wayland/client/client.pro | 1 -
 src/3rdparty/wayland/server/server.pro | 1 -
 src/3rdparty/wayland/shared.pri        | 7 +++++++
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/3rdparty/wayland/client/client.pro b/src/3rdparty/wayland/client/client.pro
index 71af897a592..c2c5eccce38 100644
--- a/src/3rdparty/wayland/client/client.pro
+++ b/src/3rdparty/wayland/client/client.pro
@@ -1,6 +1,5 @@
 TEMPLATE = lib
 TARGET = wayland-client
-DESTDIR=$$PWD/../../../../lib/
 
 CONFIG -= qt
 CONFIG += shared
diff --git a/src/3rdparty/wayland/server/server.pro b/src/3rdparty/wayland/server/server.pro
index da2bf36431d..0898b443d7d 100644
--- a/src/3rdparty/wayland/server/server.pro
+++ b/src/3rdparty/wayland/server/server.pro
@@ -1,6 +1,5 @@
 TEMPLATE = lib
 TARGET = wayland-server
-DESTDIR=$$PWD/../../../../lib/
 
 CONFIG -= qt
 CONFIG += shared
diff --git a/src/3rdparty/wayland/shared.pri b/src/3rdparty/wayland/shared.pri
index 44194dca7ad..a8b3695005f 100644
--- a/src/3rdparty/wayland/shared.pri
+++ b/src/3rdparty/wayland/shared.pri
@@ -1,5 +1,12 @@
 INCLUDEPATH += $$PWD
 
+WAYLAND_INSTALL_DIR = $$(WAYLAND_INSTALL_DIR)
+isEmpty(WAYLAND_INSTALL_DIR) {
+    DESTDIR=$$PWD/../../../lib/
+} else {
+    DESTDIR=$$WAYLAND_INSTALL_DIR
+}
+
 use_pkgconfig {
    CONFIG += link_pkgconfig
    PKGCONFIG += libffi