From aeb11d03187b2c9b64b757204f47d0698df0af80 Mon Sep 17 00:00:00 2001
From: Newsages <newsages@hotmail.com>
Date: Thu, 31 Mar 2016 15:30:00 +0200
Subject: [PATCH] not use end of / on $$VARIABLE_DIR for unix

---
 demo_r1/demo_r1.pro       | 6 +++---
 limereport/limereport.pro | 3 ++-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/demo_r1/demo_r1.pro b/demo_r1/demo_r1.pro
index be82dd1..5591daf 100644
--- a/demo_r1/demo_r1.pro
+++ b/demo_r1/demo_r1.pro
@@ -26,7 +26,7 @@ DEPENDPATH  += $$PWD/../include
 RESOURCES += \
     r1.qrc
 
-EXTRA_DIR += $$PWD/demo_reports/*
+EXTRA_DIR     += $$PWD/demo_reports
 DEST_DIR       = $${BUILD_DIR}/$${BUILD_TYPE}/demo
 REPORTS_DIR    = $${DEST_DIR}/demo_reports
 
@@ -36,8 +36,8 @@ unix:{
         LIBS += -L$${BUILD_DIR}/$${BUILD_TYPE}/lib -lQtZint
     }
     DESTDIR = $$DEST_DIR
-    QMAKE_POST_LINK += mkdir -p $$quote($$REPORTS_DIR) | $$QMAKE_COPY_DIR $$quote($$EXTRA_DIR) $$quote($$REPORTS_DIR) $$escape_expand(\n\t)
-!macx{
+    QMAKE_POST_LINK += mkdir -p $$quote($$REPORTS_DIR) | $$QMAKE_COPY $$quote($$EXTRA_DIR)/* $$quote($$REPORTS_DIR) $$escape_expand(\n\t)
+linux{
     #Link share lib to ../lib rpath
     QMAKE_LFLAGS += -Wl,--rpath=\\\$\$ORIGIN
     QMAKE_LFLAGS += -Wl,--rpath=\\\$\$ORIGIN/lib
diff --git a/limereport/limereport.pro b/limereport/limereport.pro
index c2c121f..f2bf433 100644
--- a/limereport/limereport.pro
+++ b/limereport/limereport.pro
@@ -28,10 +28,11 @@ include(limereport.pri)
 unix {
     DESTDIR  = $${BUILD_DIR}/$${BUILD_TYPE}/lib
     linux{
+        QMAKE_POST_LINK += mkdir -p $$quote($${DESTDIR}/include) $$escape_expand(\\n\\t) # qmake need make mkdir -p on subdirs more than root/
         for(FILE,EXTRA_FILES){
             QMAKE_POST_LINK += $$QMAKE_COPY $$quote($$FILE) $$quote($${DESTDIR}/include) $$escape_expand(\\n\\t) # inside of libs make /include/files
         }
-        QMAKE_POST_LINK += mkdir -p $$quote($${DESTDIR}/include) $$escape_expand(\\n\\t) # qmake need make mkdir -p on subdirs more than root/
+
     }
     macx{
         for(FILE,EXTRA_FILES){