[vidalia-svn] r3677: We may be linking to either @executable_path/lib/libmarblewi (vidalia/trunk/pkg/osx)

[edmanm@xxxxxxxxxxxxxxxxxxx]

Author: edmanm
Date: 2009-04-07 22:33:07 -0400 (Tue, 07 Apr 2009)
New Revision: 3677

Modified:
   vidalia/trunk/pkg/osx/CMakeLists.txt
Log:

We may be linking to either @executable_path/lib/libmarblewidget.7.dylib
or the absolute path to libmarblewidget.7.dylib, depending on whether you
ran 'make install' on your Marble build or not. So handle both with the
'install_name_tool -change' game.


Modified: vidalia/trunk/pkg/osx/CMakeLists.txt
===================================================================
--- vidalia/trunk/pkg/osx/CMakeLists.txt	2009-04-07 11:52:18 UTC (rev 3676)
+++ vidalia/trunk/pkg/osx/CMakeLists.txt	2009-04-08 02:33:07 UTC (rev 3677)
@@ -101,6 +101,9 @@
         -change QtDBus.framework/Versions/4/QtDBus
                 @executable_path/QtDBus ${bindir}/Vidalia
       COMMAND install_name_tool
+        -change @executable_path/lib/${marblewidget}
+                @executable_path/${marblewidget} ${bindir}/Vidalia
+      COMMAND install_name_tool
         -change ${MARBLEWIDGET_LIBRARY}
                 @executable_path/${marblewidget} ${bindir}/Vidalia