Add -headerpad_max_install_names option to linker calls and make run path configurati...

This avoids failures when running install_name_tool on Mac when creating relocatable binaries using the bundled private frameworks.

diff --git a/src/Makefile.am b/src/Makefile.am
index e338f9951c53f4942790d310efdce0da6897e69a..d924a5eb0287484b5932347df9bb9bc8fd7f3551 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -48,7 +48,8 @@ endif
 if INSTALL_MACOSX
 lyx_LDFLAGS = -framework AppKit -framework ApplicationServices \
        -Wl,-rpath,@loader_path/../Frameworks \
-       -Wl,-rpath,@executable_path/../Frameworks
+       -Wl,-rpath,@executable_path/../Frameworks \
+       -Wl,-headerpad_max_install_names
 endif
 
 if INSTALL_MACOSX

diff --git a/src/client/Makefile.am b/src/client/Makefile.am
index b6b132e93f927bf2ec0e49c813577cd1e176d7bf..c72d51aefbaf2ca14c5c1e42daaa11f73e6c4d83 100644 (file)
--- a/src/client/Makefile.am
+++ b/src/client/Makefile.am
@@ -17,7 +17,10 @@ lyxclient_LDADD = \
        $(QT_LIB) $(QT_LDFLAGS) $(LIBSHLWAPI) $(LIBPSAPI)
 
 if INSTALL_MACOSX
-lyxclient_LDFLAGS = -framework AppKit
+lyxclient_LDFLAGS = -framework AppKit \
+       -Wl,-rpath,@loader_path/../Frameworks \
+       -Wl,-rpath,@executable_path/../Frameworks \
+       -Wl,-headerpad_max_install_names
 endif
 
 SOURCEFILES = \

diff --git a/src/convert/Makefile.am b/src/convert/Makefile.am
index 2457145798818534e492502981463b9527ee3ff0..9b6bd7e2ae1391f69702966cc1478b31f2980b19 100644 (file)
--- a/src/convert/Makefile.am
+++ b/src/convert/Makefile.am
@@ -23,7 +23,8 @@ lyxconvert_LDADD = \
 
 lyxconvert_LDFLAGS = -framework AppKit \
        -Wl,-rpath,@loader_path/../Frameworks \
-       -Wl,-rpath,@executable_path/../Frameworks
+       -Wl,-rpath,@executable_path/../Frameworks \
+       -Wl,-headerpad_max_install_names
 
 else
 

diff --git a/src/support/Makefile.am b/src/support/Makefile.am
index 3a4576c4c9f75e8185e7c732241e891955efcd30..70bbee266ea5b26f5b416553b486146749dc91db 100644 (file)
--- a/src/support/Makefile.am
+++ b/src/support/Makefile.am
@@ -164,7 +164,11 @@ check_PROGRAMS = \
        check_trivstring
 
 if INSTALL_MACOSX
-ADD_FRAMEWORKS = -framework QtCore -framework AppKit -framework ApplicationServices
+ADD_FRAMEWORKS = \
+       -framework QtCore -framework AppKit -framework ApplicationServices \
+       -Wl,-rpath,@loader_path/../Frameworks \
+       -Wl,-rpath,@executable_path/../Frameworks \
+       -Wl,-headerpad_max_install_names
 endif
 
 check_convert_LDADD = liblyxsupport.a $(LIBICONV) $(BOOST_LIBS) $(QT_CORE_LIBS) $(LIBSHLWAPI) @LIBS@

diff --git a/src/tex2lyx/Makefile.am b/src/tex2lyx/Makefile.am
index da7c3183a40c07667232167bac684f769ae4f367..15817d728a517c61038c510ab47269dccdf089f6 100644 (file)
--- a/src/tex2lyx/Makefile.am
+++ b/src/tex2lyx/Makefile.am
@@ -135,7 +135,8 @@ tex2lyx_LDADD = \
 if INSTALL_MACOSX
 tex2lyx_LDFLAGS = -framework AppKit \
        -Wl,-rpath,@loader_path/../Frameworks \
-       -Wl,-rpath,@executable_path/../Frameworks
+       -Wl,-rpath,@executable_path/../Frameworks \
+       -Wl,-headerpad_max_install_names
 endif
 
 .PHONY: alltests alltests-recursive updatetests