Don't set DATA_PATH when building plugins - fixes #1464

diff --git a/extras/buildsystem/cmake/CMakeLists/root_CMakeLists.txt b/extras/buildsystem/cmake/CMakeLists/root_CMakeLists.txt
index 0f8ff5caab913d4e599f138746eaab32f0c72e0a..35f3e497f21ae6c8fa3a2fea80bc609d073ba32f 100644 (file)
--- a/extras/buildsystem/cmake/CMakeLists/root_CMakeLists.txt
+++ b/extras/buildsystem/cmake/CMakeLists/root_CMakeLists.txt
@@ -14,7 +14,6 @@ include( config )
 # Global definitions
 add_definitions(-DHAVE_CONFIG_H)
 add_definitions(-D__LIBVLC__)
-add_definitions(-DDATA_PATH=\\"${CMAKE_INSTALL_PREFIX}/share/vlc\\")
 # Large file support for Solaris and Linux:
 add_definitions(-D_FILE_OFFSET_BITS=64 -D__USE_UNIX98 -D_LARGEFILE64_SOURCE)
 # Thread safety:

diff --git a/src/Makefile.am b/src/Makefile.am
index 987a432a3cebcdd56ac16071789cbaf894aad374..b167dba8865d3e9470584b89e05d0a89579baf1b 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -145,7 +145,8 @@ endif
 
 libvlc_la_SOURCES = $(SOURCES_libvlc)
 nodist_libvlc_la_SOURCES = misc/revision.c
-libvlc_la_CFLAGS = `$(VLC_CONFIG) --cflags libvlc`
+libvlc_la_CFLAGS = `$(VLC_CONFIG) --cflags libvlc` \
+       -DDATA_PATH=\"$(pkgdatadir)\"
 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 6f6d7e32338f21c9532b423d52b9822e0d5dae09..bfe8c9505335206020996b3caab232c4a40b35a6 100644 (file)
--- a/vlc-config.in.in
+++ b/vlc-config.in.in
@@ -103,7 +103,6 @@ cppflags="${cppflags} -D_FILE_OFFSET_BITS=64 -D__USE_UNIX98 -D_LARGEFILE64_SOURC
 #  Gettext, data and plugin location
 #
 cppflags="${cppflags} -DLOCALEDIR=\"@datadir@/locale\""
-cppflags="${cppflags} -DDATA_PATH=\"@datadir@/vlc\""
 cppflags="${cppflags} -DPLUGIN_PATH=\"@libdir@/vlc\""
 
 #