[Mplayer-cvslog] CVS: main configure,1.553,1.554 Makefile,1.210,1.211

[Arpi of Ize]

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

Modified Files:
	configure Makefile 
Log Message:
ability to override MANDIR, BINDIR
patch by Dominik Mierzejewski <dominik at rangers.eu.org>
modified to remain compatible with previous solution (ie mandir=prefix/man)


Index: configure
===================================================================
RCS file: /cvsroot/mplayer/main/configure,v
retrieving revision 1.553
retrieving revision 1.554
diff -u -r1.553 -r1.554
--- configure	31 Aug 2002 02:13:20 -0000	1.553
+++ configure	1 Sep 2002 14:40:09 -0000	1.554
@@ -117,8 +117,12 @@
 
 Installation directories:
   --prefix=DIR           use this prefix for installing mplayer [/usr/local]
+  --bindir=DIR           use this prefix for installing mplayer binary
+                         [PREFIX/bin]
   --datadir=DIR          use this prefix for installing machine independent
                          data files (fonts, skins) [PREFIX/share/mplayer]
+  --mandir=DIR           use this prefix for installing manpages
+                         [PREFIX/man]
   --confdir=DIR          use this prefix for installing configuration files
                          [same as datadir]
   --libdir=DIR           use this prefix for object code libraries
@@ -1250,9 +1254,15 @@
   --prefix=*)
     _prefix=`echo $ac_option | cut -d '=' -f 2`
     ;;
+  --bindir=*)
+    _bindir=`echo $ac_option | cut -d '=' -f 2`
+    ;;
   --datadir=*)
     _datadir=`echo $ac_option | cut -d '=' -f 2`
     ;;
+  --mandir=*)
+    _mandir=`echo $ac_option | cut -d '=' -f 2`
+    ;;
   --confdir=*)
     _confdir=`echo $ac_option | cut -d '=' -f 2`
     ;;
@@ -1269,7 +1279,9 @@
 done
 
 # Atmos: moved this here, to be correct, if --prefix is specified
+test -z "$_bindir" && _bindir="$_prefix/bin"
 test -z "$_datadir" && _datadir="$_prefix/share/mplayer"
+test -z "$_mandir" && _mandir="$_prefix/man"
 test -z "$_confdir" && _confdir="$_prefix/etc/mplayer"
 test -z "$_libdir" && _libdir="$_prefix/lib"
 test -z "$_mlibdir" && _mlibdir="$MLIBHOME"
@@ -4237,7 +4249,9 @@
 TARGET_OS = $system_name
 DESTDIR =
 prefix = \$(DESTDIR)$_prefix
+BINDIR = \$(DESTDIR)$_bindir
 DATADIR = \$(DESTDIR)$_datadir
+MANDIR = \$(DESTDIR)$_mandir
 CONFDIR = \$(DESTDIR)$_confdir
 LIBDIR = \$(DESTDIR)$_libdir
 #AR = ar

Index: Makefile
===================================================================
RCS file: /cvsroot/mplayer/main/Makefile,v
retrieving revision 1.210
retrieving revision 1.211
diff -u -r1.210 -r1.211
--- Makefile	1 Sep 2002 11:39:37 -0000	1.210
+++ Makefile	1 Sep 2002 14:40:09 -0000	1.211
@@ -23,11 +23,6 @@
 DO_MAKE = @ for i in $(SUBDIRS); do $(MAKE) -C $$i $@; done
 endif
 
-#prefix = /usr/local
-BINDIR = ${prefix}/bin
-# BINDIR = /usr/local/bin
-MANDIR = ${prefix}/man
-
 # a BSD compatible 'install' program
 INSTALL = install