[vlc-devel] commit: Put plugins in $(pkglibdir)/modules ( Rémi Denis-Courmont )

[git version control]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sun Feb 14 20:04:08 2010 +0200| [c7eabcd9174667cfd57430f0220407bb5d806f98] | committer: Rémi Denis-Courmont 

Put plugins in $(pkglibdir)/modules

We can now store other architecture-dependant files in $(pkglibdir)
(and without bugging the plugins scan).

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=c7eabcd9174667cfd57430f0220407bb5d806f98
---

 modules/Makefile.am |    2 +-
 modules/common.am   |    2 +-
 src/Makefile.am     |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/Makefile.am b/modules/Makefile.am
index 5b4aec4..6c2dfcc 100644
--- a/modules/Makefile.am
+++ b/modules/Makefile.am
@@ -71,7 +71,7 @@ stamp-cache:
 
 install-exec-hook:
 	if test -z "$(DESTDIR)"; then \
-		../bin/vlc-cache-gen$(EXEEXT) "$(vlclibdir)" ; \
+		../bin/vlc-cache-gen$(EXEEXT) "$(vlclibdir)/modules" ; \
 	else \
 		echo "Staged installation: cache generation skipped!" ; \
 	fi
diff --git a/modules/common.am b/modules/common.am
index 64d9a22..4eaeb42 100644
--- a/modules/common.am
+++ b/modules/common.am
@@ -7,7 +7,7 @@
 
 NULL =
 SUFFIXES =
-libvlcdir = $(vlclibdir)/$(basedir)
+libvlcdir = $(vlclibdir)/modules/$(basedir)
 EXTRA_DIST = Modules.am
 BUILT_SOURCES =
 CLEANFILES = $(BUILT_SOURCES)
diff --git a/src/Makefile.am b/src/Makefile.am
index 2f7663d..8468da0 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -192,7 +192,7 @@ libvlccore_la_CFLAGS = `$(VLC_CONFIG) --cflags libvlccore` \
 	-DSYSCONFDIR=\"$(sysconfdir)\" \
 	-DDATA_PATH=\"$(vlcdatadir)\" \
 	-DLIBDIR=\"$(libdir)\" \
-	-DPLUGIN_PATH=\"$(vlclibdir)\"
+	-DPLUGIN_PATH=\"$(vlclibdir)/modules\"
 libvlccore_la_LDFLAGS = `$(VLC_CONFIG) --ldflags libvlccore` $(AM_LDFLAGS) \
 	-no-undefined \
 	-export-symbols $(srcdir)/libvlccore.sym \