1
mirror of https://github.com/mpv-player/mpv synced 2024-10-06 14:54:02 +02:00

libdir changed

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5815 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
arpi 2002-04-24 20:00:13 +00:00
parent 6d83d1d109
commit 27a59e4c70
4 changed files with 5 additions and 4 deletions

3
configure vendored
View File

@ -1082,7 +1082,7 @@ done
# Atmos: moved this here, to be correct, if --prefix is specified
test -z "$_datadir" && _datadir="$_prefix/share/mplayer"
test -z "$_confdir" && _confdir="$_datadir"
test -z "$_libdir" && _libdir="$_prefix/lib/mplayer"
test -z "$_libdir" && _libdir="$_prefix/lib"
test -z "$_mlibdir" && _mlibdir="$MLIBHOME"
if x86 ; then
@ -3564,6 +3564,7 @@ LIRC_LIB = $_ld_lirc
CSS_USE = $_css
CSS_LIB = $_ld_css
DVDKIT = $_dvdkit
DVDKIT_SHARED = no
SDL_INC = $_inc_sdl
W32_DEP = $_dep_win32
W32_LIB = $_ld_win32

2
debian/rules vendored
View File

@ -54,7 +54,7 @@ binary-arch: build
dh_installdirs
# commands to install the package into debian/<packagename>
$(MAKE) prefix=$(prefix)/usr CONFDIR=$(prefix)/etc/mplayer LIBDIR=$(prefix)/usr/lib/mplayer DATADIR=$(prefix)/usr/share/mplayer MANDIR=$(prefix)/usr/share/man install
$(MAKE) prefix=$(prefix)/usr CONFDIR=$(prefix)/etc/mplayer LIBDIR=$(prefix)/usr/lib DATADIR=$(prefix)/usr/share/mplayer MANDIR=$(prefix)/usr/share/man install
dh_link usr/bin/mplayer usr/bin/gmplayer \
usr/share/man/man1/mplayer.1.gz usr/share/man/man1/gmplayer.1.gz

View File

@ -694,7 +694,7 @@ int vidix_preinit(const char *drvname,void *server)
printf("vosub_vidix: You have wrong version of VIDIX library\n");
return -1;
}
vidix_handler = vdlOpen(LIBDIR"/vidix/",
vidix_handler = vdlOpen(LIBDIR"/mplayer/vidix/",
drvname ? drvname[0] == ':' ? &drvname[1] : drvname[0] ? drvname : NULL : NULL,
TYPE_OUTPUT,
verbose);

View File

@ -2,7 +2,7 @@
include ../../config.mak
BINDIR = $(LIBDIR)/vidix
BINDIR = $(LIBDIR)/mplayer/vidix
RADEON_VID=radeon_vid.so