From 4ac05993daccf27c45adb0e5d298fc599ba8a694 Mon Sep 17 00:00:00 2001
From: Martin Rotter <rotter@praktik.cz>
Date: Tue, 12 May 2020 13:18:18 +0200
Subject: [PATCH] Change linking of dylib.

---
 pri/install.pri                          | 8 ++++----
 resources/scripts/.travis-install-osx.sh | 4 ++++
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/pri/install.pri b/pri/install.pri
index 3aa624478..8f7e721e3 100644
--- a/pri/install.pri
+++ b/pri/install.pri
@@ -209,8 +209,6 @@ mac {
   QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.8
   LIBS += -framework AppKit
 
-  QMAKE_POST_LINK += $$system(install_name_tool -change "librssguard.dylib" "@executable_path/librssguard.dylib" $$OUT_PWD/rssguard)
-
   target.path = $$quote($$PREFIX/Contents/MacOS/)
 
   lib.files = $$OUT_PWD/../librssguard/librssguard.dylib
@@ -239,13 +237,15 @@ mac {
   INSTALL_HEADERS_PREFIX = $$quote($$PREFIX/Contents/Resources/Include/libtextosaurus/)
 }
 
+message($$MSG_PREFIX: Prefix for headers is \"$$INSTALL_HEADERS_PREFIX\".)
+
 # Create install step for each folder of public headers.
 for(header, INSTALL_HEADERS) {
   path = $${INSTALL_HEADERS_PREFIX}/$${dirname(header)}
 
-  message($$MSG_PREFIX: Adding header \"$$header\" to \"make install\" step.)
+  message($$MSG_PREFIX: Adding header \"$$header\" to \"make install\" step with path \"$$path\".)
 
   eval(headers_$${dirname(header)}.files += $$header)
-  eval(headers_$${dirname(header)}.path = $$path)
+  eval(headers_$${dirname(header)}.path = $$quote($$path))
   eval(INSTALLS *= headers_$${dirname(header)})
 }
diff --git a/resources/scripts/.travis-install-osx.sh b/resources/scripts/.travis-install-osx.sh
index 1b66eae93..e744edab9 100755
--- a/resources/scripts/.travis-install-osx.sh
+++ b/resources/scripts/.travis-install-osx.sh
@@ -13,7 +13,11 @@ cd "src/rssguard"
 
 # Fix .dylib linking.
 install_name_tool -change "librssguard.dylib" "@executable_path/librssguard.dylib" "RSS Guard.app/Contents/MacOS/rssguard"
+install_name_tool -change "librssguard.dylib" "@executable_path/librssguard.dylib" "rssguard"
+
 otool -L "RSS Guard.app/Contents/MacOS/rssguard"
+otool -L "rssguard"
+
 make dmg
 
 # Rename DMG.