diff options
| author | Gerald Combs <gerald@wireshark.org> | 2013-09-30 13:12:28 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2013-09-30 13:12:28 +0000 |
| commit | 2211ab0fba17d71cc25f6b0d026f04d241bbced1 (patch) | |
| tree | a43632d0ddd54f4f87f2a68b79a046f9f60be35b /configure.ac | |
| parent | 67da8b61fd5e8cd64bcf2461411cb1e134be2b97 (diff) | |
Use macdeployqt to add the Qt bits to our bundle. Put our libraries in
Contents/Frameworks since that's what macdeployqt expects. Have
osx-dmg.sh look at the correct executable.
svn path=/trunk/; revision=52295
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index 914d41964b..9997aea9b2 100644 --- a/configure.ac +++ b/configure.ac @@ -1075,7 +1075,7 @@ darwin*) # libraries in the rpath, rather than having a script tweak # DYLD_LIBRARY_PATH. # - LDFLAGS="-Wl,-search_paths_first -Wl,-rpath,@executable_path/../lib -Wl,-rpath,@executable_path/../Resources/lib -Wl,-rpath,/usr/local/lib $LDFLAGS" + LDFLAGS="-Wl,-search_paths_first -Wl,-rpath,@executable_path/../lib -Wl,-rpath,@executable_path/../Frameworks -Wl,-rpath,/usr/local/lib $LDFLAGS" AC_MSG_RESULT([Apple linker - added -Wl,-single_module and -Wl,-search_paths_first, and rpaths]) ;; cygwin*) |