From 865d4b77957f3d16f667e2d62de5c423cc68928b Mon Sep 17 00:00:00 2001 From: Petri Hintukainen Date: Tue, 17 Mar 2015 07:01:23 +0000 Subject: [PATCH] do not install dsm plugin twice MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit On ma, 2015-03-16 at 13:59 +0300, Rémi Denis-Courmont wrote: > Le 2015-03-16 13:24, Petri Hintukainen a écrit : > > I tried to enable dsm access plugin in Linux (to get directory > > browsing > > support). But "make install" failed with error: > > > > libtool: install: error: cannot install `libdsm_plugin.la' to a > > directory not ending in /usr/lib/vlc/plugins/services_discovery > > > > It looks like the module is installed twice: first to access/, then > > to > > services_discovery/. Installing it only to services_discovery/ seems > > to > > work. > > The (rest of the) Makefile rules are in access/ though... Removing it from services_discovery/Makefile.am in commit http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=42350148049e6a91db1f6876d1e0765640da0f7d didn't fix the problem with make install. With ../configure --prefix=/usr --enable-dsm --disable-smb make && sudo make install I still get libtool: install: error: cannot install `libdsm_plugin.la' to a directory not ending in /usr/lib/vlc/plugins/services_discovery Alternative patch attached. (or maybe I have broken libtool ... ?) >From 43e5502bb44f8611eb1d61cc8fa6c1c711dce32b Mon Sep 17 00:00:00 2001 From: Petri Hintukainen Date: Tue, 17 Mar 2015 09:52:47 +0200 Subject: [PATCH] dsm: fix runtime library search path Fixes "libtool: install: error: cannot install `libdsm_plugin.la' to a directory not ending in /usr/lib/vlc/plugins/services_discovery" Signed-off-by: Jean-Baptiste Kempf --- modules/access/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/access/Makefile.am b/modules/access/Makefile.am index 3bc9146c6b..3088fdbcf6 100644 --- a/modules/access/Makefile.am +++ b/modules/access/Makefile.am @@ -416,7 +416,7 @@ EXTRA_LTLIBRARIES += libsmb_plugin.la libdsm_plugin_la_SOURCES = access/dsm/access.c access/dsm/sd.c libdsm_plugin_la_CFLAGS = $(AM_CFLAGS) $(DSM_CFLAGS) libdsm_plugin_la_LIBADD = $(DSM_LIBS) -libdsm_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(sddir)' +libdsm_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(accessdir)' access_LTLIBRARIES += $(LTLIBdsm) EXTRA_LTLIBRARIES += libdsm_plugin.la -- 2.39.2