Changeset 007245adca45856651d28a580622b2835639f040

Show
Ignore:
Timestamp:
02/10/08 13:34:34 (5 months ago)
Author:
Rémi Denis-Courmont <rem@videolan.org>
git-committer:
Rémi Denis-Courmont <rem@videolan.org> 1202646874 +0000
git-parent:

[b4c313573076f43fb5c8e8bf0b104d4615441028]

git-author:
Rémi Denis-Courmont <rem@videolan.org> 1202646874 +0000
Message:

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

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • extras/buildsystem/cmake/CMakeLists/root_CMakeLists.txt

    r2e42751 r007245a  
    1515add_definitions(-DHAVE_CONFIG_H) 
    1616add_definitions(-D__LIBVLC__) 
    17 add_definitions(-DDATA_PATH=\\"${CMAKE_INSTALL_PREFIX}/share/vlc\\") 
    1817# Large file support for Solaris and Linux: 
    1918add_definitions(-D_FILE_OFFSET_BITS=64 -D__USE_UNIX98 -D_LARGEFILE64_SOURCE) 

  • src/Makefile.am

    r7185386 r007245a  
    146146libvlc_la_SOURCES = $(SOURCES_libvlc) 
    147147nodist_libvlc_la_SOURCES = misc/revision.c 
    148 libvlc_la_CFLAGS = `$(VLC_CONFIG) --cflags libvlc` 
     148libvlc_la_CFLAGS = `$(VLC_CONFIG) --cflags libvlc` \ 
     149    -DDATA_PATH=\"$(pkgdatadir)\" 
    149150libvlc_la_CXXFLAGS = `$(VLC_CONFIG) --cxxflags libvlc` 
    150151libvlc_la_OBJCFLAGS = `$(VLC_CONFIG) --objcflags libvlc` 

  • vlc-config.in.in

    r848c1c1 r007245a  
    104104# 
    105105cppflags="${cppflags} -DLOCALEDIR=\"@datadir@/locale\"" 
    106 cppflags="${cppflags} -DDATA_PATH=\"@datadir@/vlc\"" 
    107106cppflags="${cppflags} -DPLUGIN_PATH=\"@libdir@/vlc\"" 
    108107