[vlc-devel] commit: Set PLUGIN_PATH and LOCALEDIR only for libvlc ( Rémi Denis-Courmont )

[git version control]

vlc | branch: master | Rémi Denis-Courmont <rem at videolan.org> | Wed Mar 19 20:40:16 2008 +0200| [484c93112f2827cf242c6f4807f7f48f28be6aa9]

Set PLUGIN_PATH and LOCALEDIR only for libvlc

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

 src/Makefile.am  |    4 +++-
 vlc-config.in.in |    6 ------
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/Makefile.am b/src/Makefile.am
index f640277..e465c59 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -158,7 +158,9 @@ endif
 libvlc_la_SOURCES = $(SOURCES_libvlc)
 nodist_libvlc_la_SOURCES = misc/revision.c
 libvlc_la_CFLAGS = `$(VLC_CONFIG) --cflags libvlc` \
-	-DDATA_PATH=\"$(pkgdatadir)\"
+	-DLOCALEDIR=\"$(localedir)\" \
+	-DDATA_PATH=\"$(pkgdatadir)\" \
+	-DPLUGIN_PATH=\"$(pkglibdir)\"
 libvlc_la_CXXFLAGS = `$(VLC_CONFIG) --cxxflags libvlc`
 libvlc_la_OBJCFLAGS = `$(VLC_CONFIG) --objcflags libvlc`
 libvlc_la_LDFLAGS = `$(VLC_CONFIG) --ldflags libvlc` $(AM_LDFLAGS) \
diff --git a/vlc-config.in.in b/vlc-config.in.in
index bfe8c95..6c95b46 100644
--- a/vlc-config.in.in
+++ b/vlc-config.in.in
@@ -100,12 +100,6 @@ linkage="c"
 cppflags="${cppflags} -D_FILE_OFFSET_BITS=64 -D__USE_UNIX98 -D_LARGEFILE64_SOURCE -D_REENTRANT -D_THREAD_SAFE"
 
 #
-#  Gettext, data and plugin location
-#
-cppflags="${cppflags} -DLOCALEDIR=\"@datadir@/locale\""
-cppflags="${cppflags} -DPLUGIN_PATH=\"@libdir@/vlc\""
-
-#
 #  Various additional defines
 #
 if [ "${debug}" = yes ]; then