[MPlayer-dev-eng] [PATCH] use /usr/lib/codecs as default codec location

[Diego Biurrun]

Alex Beregszaszi writes:
 > > --- configure	3 May 2003 14:54:08 -0000	1.701
 > > +++ configure	6 May 2003 23:19:50 -0000
 > > @@ -4123,7 +4123,7 @@
 > >  if test "$_win32" != no ; then
 > >    echocheck "Win32 codec DLL files path"
 > >      if test -z "$_win32libdir" ; then
 > > -      for I in "$_libdir/win32" /usr/local/lib/win32 /usr/lib/win32 ;
 > > do+      for I in "$_libdir/codecs" /usr/local/lib/win32
 > instead $_libdir/codecs $_libdir/win32 ...

OK, this is better since it's backwards compatible.

 > i will commit this today, please prepare some docs changes, but send it
 > here for discussion

As you wish.  Hm, actually I think we should put /usr/local/lib/codecs/
instead of /usr/lib/codecs/ in the docs, as our default install
location is /usr/local/, shouldn't we?

Diego


--- README	18 Mar 2003 20:22:36 -0000	1.7
+++ README	12 May 2003 00:16:39 -0000
@@ -107,7 +107,7 @@
 formats. Please note that most codecs only work on Intel x86 compatible PCs.
 
 Unpack the codecs archives and put the contents in a directory where MPlayer
-will find them. The default directory is /usr/lib/win32/ but you can change
+will find them. The default directory is /usr/lib/codecs/ but you can change
 that to something else by using the '--with-win32libdir=DIR' option when you
 run './configure'.
--- DOCS/en/codecs.html	30 Apr 2003 21:17:02 -0000	1.119
+++ DOCS/en/codecs.html	12 May 2003 00:16:41 -0000
@@ -339,7 +339,7 @@
   <LI>download QuickTime DLL pack from
     <A HREF="http://www.mplayerhq.hu/MPlayer/releases/codecs/">http://www.mplayerhq.hu/MPlayer/releases/codecs/</A></LI>
   <LI>extract QuickTime DLL pack to your Win32 codecs directory (default:
-    <CODE>/usr/lib/win32</CODE>)</LI>
+    <CODE>/usr/lib/codecs/</CODE>)</LI>
 </OL>
--- DOCS/en/faq.html	29 Mar 2003 10:54:00 -0000	1.125
+++ DOCS/en/faq.html	12 May 2003 00:16:41 -0000
@@ -300,7 +300,7 @@
   <DD>&nbsp;</DD>
 
   <DT>Q: There are error messages about file not found
-    <CODE>/usr/lib/win32/</CODE> ...</DT>
+    <CODE>/usr/lib/codecs/</CODE> ...</DT>
   <DD>A: Download the Win32 codecs from our
     <A HREF="http://www.mplayerhq.hu/MPlayer/releases/codecs/">codecs page</A>
     (avifile's codec package has a different DLL set) and install it.</DD>
--- DOCS/en/documentation.html	29 Apr 2003 02:01:52 -0000	1.403
+++ DOCS/en/documentation.html	12 May 2003 00:16:43 -0000
@@ -584,7 +584,7 @@
   <LI><B>Win32 codecs</B>: If you plan to use MPlayer on x86 architecture, you 
     will possibly need them. Download the Win32 codecs from our
     <A HREF="http://www.mplayerhq.hu/MPlayer/releases/codecs/">codecs page</A>
-    and install them to <CODE>/usr/lib/win32</CODE> <B>BEFORE</B> compiling
+    and install them to <CODE>/usr/lib/codecs/</CODE> <B>BEFORE</B> compiling
     MPlayer, otherwise no Win32 support will be compiled!<BR>
     <B>Note:</B> the avifile project has a similar codecs package, but it differs
     from ours. If you want to use all supported codecs, then install our package