# HG changeset patch
# User arpi
# Date 1019678413 0
# Node ID 16186e365197392aaed666122aefb87ea88236ab
# Parent  737920323eb88830960f115f9ce1c87788a7b8b5
libdir changed

diff -r 737920323eb8 -r 16186e365197 configure
--- 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
diff -r 737920323eb8 -r 16186e365197 debian/rules
--- 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
 
diff -r 737920323eb8 -r 16186e365197 libvo/vosub_vidix.c
--- 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);
diff -r 737920323eb8 -r 16186e365197 vidix/drivers/Makefile
--- a/vidix/drivers/Makefile	Wed Apr 24 19:37:10 2002 +0000
+++ b/vidix/drivers/Makefile	Wed Apr 24 20:00:13 2002 +0000
@@ -2,7 +2,7 @@
 
 include ../../config.mak
 
-BINDIR = $(LIBDIR)/vidix
+BINDIR = $(LIBDIR)/mplayer/vidix
 
 
 RADEON_VID=radeon_vid.so