summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorarpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-09-01 14:40:09 +0000
committerarpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-09-01 14:40:09 +0000
commit688e04de22a7b78fab164b8cc0d08f914a735937 (patch)
treecf20f2fd785626e3f96925d4e4d73e760f869376
parentd8edb8566cf577169d1d17de0665d8b0e097459d (diff)
downloadmpv-688e04de22a7b78fab164b8cc0d08f914a735937.tar.bz2
mpv-688e04de22a7b78fab164b8cc0d08f914a735937.tar.xz
ability to override MANDIR, BINDIR
patch by Dominik Mierzejewski <dominik@rangers.eu.org> modified to remain compatible with previous solution (ie mandir=prefix/man) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7222 b3059339-0415-0410-9bf9-f77b7e298cf2
-rw-r--r--Makefile5
-rwxr-xr-xconfigure14
2 files changed, 14 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index 7f94aafefb..747fd8632c 100644
--- a/Makefile
+++ b/Makefile
@@ -23,11 +23,6 @@ SUBDIRS += libdha vidix
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
diff --git a/configure b/configure
index ee49cf1ec0..a849e1fe60 100755
--- a/configure
+++ b/configure
@@ -117,8 +117,12 @@ Configuration:
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 @@ for ac_option do
--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 @@ for ac_option do
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 @@ LANG = C
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