qmake|Mac OS X: Tweaked library install name functions

If the Qt install directory is found in the linked library name it will be removed and replaced with the relative "../Frameworks/" path.
skyjake · Mar 24, 2013 · 9aea7ce · 9aea7ce
1 parent 3cd9173
commit 9aea7ce
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/doomsday/config.pri b/doomsday/config.pri
@@ -88,14 +88,15 @@ defineTest(doPostLink) {
 }
 
 macx {
+    defineTest(removeQtLibPrefix) {
+        doPostLink("install_name_tool -change $$[QT_INSTALL_LIBS]/$$2 $$2 $$1")
+    }
     defineTest(fixInstallName) {
         # 1: binary file
         # 2: library name
         # 3: path to Frameworks/
+        removeQtLibPrefix($$1, $$2)
         doPostLink("install_name_tool -change $$2 @executable_path/$$3/Frameworks/$$2 $$1")
-
-        # Also try the Qt frameworks directory.
-        doPostLink("install_name_tool -change $$[QT_INSTALL_LIBS]/$$2 @executable_path/$$3/Frameworks/$$2 $$1")
     }
     defineTest(fixPluginInstallId) {
         # 1: target name