Skip to content

V
vlc-2-2
Commit 484c9311 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files
Options

Set PLUGIN_PATH and LOCALEDIR only for libvlc

parent 50f3a306
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 7 deletions
src/Makefile.am
View file @ 484c9311
...@@ -158,7 +158,9 @@ endif ...@@ -158,7 +158,9 @@ endif
libvlc_la_SOURCES = $(SOURCES_libvlc) libvlc_la_SOURCES = $(SOURCES_libvlc)
nodist_libvlc_la_SOURCES = misc/revision.c nodist_libvlc_la_SOURCES = misc/revision.c
libvlc_la_CFLAGS = `$(VLC_CONFIG) --cflags libvlc` \ 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_CXXFLAGS = `$(VLC_CONFIG) --cxxflags libvlc`
libvlc_la_OBJCFLAGS = `$(VLC_CONFIG) --objcflags libvlc` libvlc_la_OBJCFLAGS = `$(VLC_CONFIG) --objcflags libvlc`
libvlc_la_LDFLAGS = `$(VLC_CONFIG) --ldflags libvlc` $(AM_LDFLAGS) \ libvlc_la_LDFLAGS = `$(VLC_CONFIG) --ldflags libvlc` $(AM_LDFLAGS) \
......
vlc-config.in.in
View file @ 484c9311
...@@ -99,12 +99,6 @@ linkage="c" ...@@ -99,12 +99,6 @@ linkage="c"
# #
cppflags="${cppflags} -D_FILE_OFFSET_BITS=64 -D__USE_UNIX98 -D_LARGEFILE64_SOURCE -D_REENTRANT -D_THREAD_SAFE" 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 # Various additional defines
# #
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment