[Mplayer-cvslog] CVS: main Makefile,1.237,1.238 configure,1.616,1.617

[Arpi of Ize]

Update of /cvsroot/mplayer/main
In directory mail:/var/tmp.root/cvs-serv7365

Modified Files:
	Makefile configure 
Log Message:
a little (my first!) patch to add some info about MPlayer on Irix 6.5 to
documentation.html and some changes to the configure script + Makefile to
support optional different "install" location and change ranlib to ar when
Irix is detected.
Steffen Boelaars <mplayer.development at graphicscave.com>


Index: Makefile
===================================================================
RCS file: /cvsroot/mplayer/main/Makefile,v
retrieving revision 1.237
retrieving revision 1.238
diff -u -r1.237 -r1.238
--- Makefile	26 Nov 2002 22:55:32 -0000	1.237
+++ Makefile	4 Dec 2002 23:29:26 -0000	1.238
@@ -16,15 +16,11 @@
 INSTALLSTRIP = -s
 endif
 
-
 # These subdirectories require installation due to binaries within them.
 ifeq ($(VIDIX),yes)
 SUBDIRS += libdha vidix
 DO_MAKE = @ for i in $(SUBDIRS); do $(MAKE) -C $$i $@; done
 endif
-
-# a BSD compatible 'install' program
-INSTALL = install
 
 SRCS_COMMON = cpudetect.c codec-cfg.c cfgparser.c my_profile.c spudec.c playtree.c playtreeparser.c asxparser.c vobsub.c subreader.c sub_cc.c find_sub.c m_config.c m_option.c parser-cfg.c m_struct.c
 SRCS_MENCODER = mencoder.c mp_msg-mencoder.c $(SRCS_COMMON) libao2/afmt.c divx4_vbr.c libvo/aclib.c libvo/osd.c libvo/sub.c libvo/font_load.c libvo/font_load_ft.c xvid_vbr.c parser-mecmd.c

Index: configure
===================================================================
RCS file: /cvsroot/mplayer/main/configure,v
retrieving revision 1.616
retrieving revision 1.617
diff -u -r1.616 -r1.617
--- configure	4 Dec 2002 21:33:36 -0000	1.616
+++ configure	4 Dec 2002 23:29:26 -0000	1.617
@@ -222,6 +222,9 @@
   --language=xx          select a language (for translated messages/gui) [en]
                          (Available: $LANGUAGES)
   --enable-shared-pp     install & use shared postprocessing lib
+  --install-path=PATH    the path to a custom install program (useful if
+                         your OS uses a GNU-incompatible install utility by
+                         default and you want to point to the GNU version)
 
 Advanced options:
   --enable-mmx           build with mmx support [autodetect]
@@ -272,6 +275,8 @@
 
 
 # 1st pass checking for vital options
+_install=install
+_ranlib=ranlib
 _cc=gcc
 test "$CC" && _cc="$CC"
 _as=auto
@@ -315,6 +320,9 @@
   --disable-runtime-cpudetection)
     _runtime_cpudetection=no
     ;;
+  --install-path=*)
+    _install=`echo $ac_option | cut -d '=' -f 2 | sed 's/\/$//'`"/install"
+    ;;
   esac
 done
 
@@ -1036,6 +1044,7 @@
   --with-extralibdir=*) ;;
   --enable-runtime-cpudetection) ;;
   --disable-runtime-cpudetection) ;;
+  --install-path=*) ;;
 
   # Real 2nd pass
   --enable-mencoder)	_mencoder=yes	;;
@@ -1474,6 +1483,10 @@
 fi
 fi
 
+# If IRIX we must use ar instead of ranlib (not present on IRIX systems)
+if irix ; then
+  _ranlib='ar -r'
+fi
 
 ######################
 # MAIN TESTS GO HERE #
@@ -4570,7 +4583,8 @@
 #AR = ar
 CC = $_cc
 AWK = $_awk
-RANLIB = ranlib
+RANLIB = $_ranlib
+INSTALL = $_install
 # OPTFLAGS = -O4 $_profile $_debug $_march $_mcpu -pipe -fomit-frame-pointer -ffast-math
 OPTFLAGS = $CFLAGS
 EXTRA_INC = $_inc_extra $_inc_gtk