fix up the rpaths for our installed .so's

svn path=/trunk/moon/; revision=148582
mono · Dec 16, 2009 · fb8240a · fb8240a
1 parent 8c0bf4d
commit fb8240a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/plugin/Makefile.am b/plugin/Makefile.am
@@ -17,7 +17,7 @@ INCLUDES = \
 
 #--- libmoonloader ----------------------
 libmoonloader_la_LDFLAGS = \
-	-avoid-version
+	-avoid-version -rpath $(pluginlibdir) -R $(pluginlibdir) -R $(libdir)
 
 libmoonloader_la_LIBADD = -ldl $(LOADER_LIBS)
 
@@ -34,7 +34,7 @@ libmoonloaderxpi_la_SOURCES = $(libmoonloader_la_SOURCES)
 #--- libmoonplugin ----------------------
 
 libmoonplugin_la_LDFLAGS = \
-	-avoid-version
+	-avoid-version -rpath $(pluginlibdir) -R $(pluginlibdir) -R $(libdir)
 
 libmoonplugin_la_LIBADD = $(top_builddir)/src/libmoon.la $(PLUGIN_LIBS)
 

diff --git a/src/Makefile.am b/src/Makefile.am
@@ -275,6 +275,8 @@ libmoonxpi_la_LIBADD = $(MOON_XPI_LIBS)
 
 libmoonxpi_la_SOURCES = $(libmoon_la_SOURCES)
 
+libmoon_la_LDFLAGS = -rpath /nowhere
+
 runtime.lo: fullscreen.h incomplete-support.h drm.h
 
 fullscreen.h: fullscreen.xaml xaml-to-header.exe