From 00a48cb0eaac063f642f964d9f5006155bdbcb1f Mon Sep 17 00:00:00 2001
From: Chris Clime <chris.clime@gmx.net>
Date: Sat, 6 Jan 2018 18:59:43 +0100
Subject: [PATCH] correct deployment: qmake requires { to be in same line is
 "isEmpty" adapt clickable.json file

---
 .gitignore                    | 1 +
 clickable.json                | 2 +-
 deployment.pri                | 5 +++--
 ubuntuBuildWithinContainer.sh | 5 +++--
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index adb7410f..778e0e5a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+/.clickable/
 /.make.cache
 /Makefile
 /bld.inf
diff --git a/clickable.json b/clickable.json
index 5940305c..791d3ae0 100644
--- a/clickable.json
+++ b/clickable.json
@@ -3,6 +3,6 @@
   "arch": "armhf",
   "chroot": false,
   "template": "custom",
-  "build": "bash -c 'cd .. ; qt5-qmake-arm-linux-gnueabihf CONFIG+=ubuntu clickBuildFolder=click_build; make install'",
+  "build": "bash -c 'cd .. ; qt5-qmake-arm-linux-gnueabihf CONFIG+=ubuntu clickBuildFolder=click_build; make clean ; make install'",
   "dependencies": [ "libcurl4-gnutls-dev" ]
 }
diff --git a/deployment.pri b/deployment.pri
index db24b7b0..a92a71a3 100644
--- a/deployment.pri
+++ b/deployment.pri
@@ -111,10 +111,11 @@ symbian {
         export(splash.path)
         INSTALLS += splash
     } else:ubuntu {
-        isEmpty(clickBuildFolder)
-        {
+
+        isEmpty(clickBuildFolder){
           clickBuildFolder = /
         }
+
         installPrefix = $${clickBuildFolder}
         desktopfile.files = data/$${TARGET}_ubuntu.desktop
         desktopfile.path = $${clickBuildFolder}
diff --git a/ubuntuBuildWithinContainer.sh b/ubuntuBuildWithinContainer.sh
index 1b60190f..341bddf8 100755
--- a/ubuntuBuildWithinContainer.sh
+++ b/ubuntuBuildWithinContainer.sh
@@ -2,10 +2,11 @@
 
 # build inside libertine container on the phone
 
-buildDir=$(readlink -f "./click_build")
+buildDirName="click_build"
+buildDir=$(readlink -f "./$buildDirName")
 echo "builddir is $buildDir"
 mkdir -p "$buildDir"
-qmake . CONFIG+=ubuntu
+qmake . CONFIG+=ubuntu clickBuildFolder=$buildDirName
 make clean
 make install
 cd "$buildDir"