Don't set DATA_PATH when building plugins - fixes #1464
authorRémi Denis-Courmont <rem@videolan.org>
Sun, 10 Feb 2008 12:34:34 +0000 (12:34 +0000)
committerRémi Denis-Courmont <rem@videolan.org>
Sun, 10 Feb 2008 12:34:34 +0000 (12:34 +0000)
extras/buildsystem/cmake/CMakeLists/root_CMakeLists.txt
src/Makefile.am
vlc-config.in.in

index 0f8ff5c..35f3e49 100644 (file)
@@ -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:
index 987a432..b167dba 100644 (file)
@@ -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) \
index 6f6d7e3..bfe8c95 100644 (file)
@@ -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\""
 
 #