diff options
| author | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-04-24 20:00:13 +0000 |
|---|---|---|
| committer | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-04-24 20:00:13 +0000 |
| commit | 27a59e4c70a5303cea105dd885219c3ace959f0d (patch) | |
| tree | 38f1dce2c866d0a993aaeb4ab25c3e04d202a82b | |
| parent | 6d83d1d10919c4fbf8a35cd55c45780b641b7f78 (diff) | |
| download | mpv-27a59e4c70a5303cea105dd885219c3ace959f0d.tar.bz2 mpv-27a59e4c70a5303cea105dd885219c3ace959f0d.tar.xz | |
libdir changed
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5815 b3059339-0415-0410-9bf9-f77b7e298cf2
| -rwxr-xr-x | configure | 3 | ||||
| -rwxr-xr-x | debian/rules | 2 | ||||
| -rw-r--r-- | libvo/vosub_vidix.c | 2 | ||||
| -rw-r--r-- | vidix/drivers/Makefile | 2 |
4 files changed, 5 insertions, 4 deletions
@@ -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 diff --git a/debian/rules b/debian/rules index b844a571d7..2f95e1c457 100755 --- a/debian/rules +++ b/debian/rules @@ -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 diff --git a/libvo/vosub_vidix.c b/libvo/vosub_vidix.c index 67db7c8878..72ef1f44e2 100644 --- a/libvo/vosub_vidix.c +++ b/libvo/vosub_vidix.c @@ -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); diff --git a/vidix/drivers/Makefile b/vidix/drivers/Makefile index ac6ceaef5b..8fa2f56af2 100644 --- a/vidix/drivers/Makefile +++ b/vidix/drivers/Makefile @@ -2,7 +2,7 @@ include ../../config.mak -BINDIR = $(LIBDIR)/vidix +BINDIR = $(LIBDIR)/mplayer/vidix RADEON_VID=radeon_vid.so |