Mercurial > mplayer.hg
changeset 5814:16186e365197
libdir changed
| author | arpi |
|---|---|
| date | Wed, 24 Apr 2002 20:00:13 +0000 |
| parents | 737920323eb8 |
| children | 268cfcb03e86 |
| files | configure debian/rules libvo/vosub_vidix.c vidix/drivers/Makefile |
| diffstat | 4 files changed, 5 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/configure Wed Apr 24 19:37:10 2002 +0000 +++ b/configure Wed Apr 24 20:00:13 2002 +0000 @@ -1082,7 +1082,7 @@ # 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 @@ CSS_USE = $_css CSS_LIB = $_ld_css DVDKIT = $_dvdkit +DVDKIT_SHARED = no SDL_INC = $_inc_sdl W32_DEP = $_dep_win32 W32_LIB = $_ld_win32
--- a/debian/rules Wed Apr 24 19:37:10 2002 +0000 +++ b/debian/rules Wed Apr 24 20:00:13 2002 +0000 @@ -54,7 +54,7 @@ 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
--- a/libvo/vosub_vidix.c Wed Apr 24 19:37:10 2002 +0000 +++ b/libvo/vosub_vidix.c Wed Apr 24 20:00:13 2002 +0000 @@ -694,7 +694,7 @@ 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);