--confdir

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@3748 b3059339-0415-0410-9bf9-f77b7e298cf2

1 files changed, 11 insertions, 2 deletions

diff --git a/configure b/configure
index 2d84525f5f..cf2f1d2969 100755
--- a/configure
+++ b/configure
@@ -108,7 +108,9 @@ Configuration:
 Installation directories:
   --prefix=DIR           use this prefix for installing mplayer [/usr/local]
   --datadir=DIR          use this prefix for installing machine independent
-                         data [/usr/local/share/mplayer]
+                         data files (fonts, skins) [PREFIX/share/mplayer]
+  --confdir=DIR          use this prefix for installing configuration files
+                         [same as datadir]
 
 Optional features:
   --disable-mencoder     disable mencoder [autodetect]
@@ -882,6 +884,9 @@ for ac_option do
   --datadir=*)
     _datadir=`echo $ac_option | cut -d '=' -f 2`
     ;;
+  --confdir=*)
+    _confdir=`echo $ac_option | cut -d '=' -f 2`
+    ;;
 
 
   *)
@@ -893,7 +898,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
 
 
 if x86 ; then
@@ -2638,6 +2643,8 @@ cat > config.mak << EOF
 LANG = C
 TARGET_OS = $system_name
 prefix = $_prefix
+DATADIR = $_datadir
+CONFDIR = $_confdir
 AR = ar
 CC = $_cc
 # OPTFLAGS = -O4 $_profile $_debug $_march $_mcpu -pipe -fomit-frame-pointer -ffast-math
@@ -2736,6 +2743,7 @@ $_def_dvdread
 
 /* Common data directory (for fonts, etc) */
 #define DATADIR "$_datadir"
+#define CONFDIR "$_confdir"
 
 /* Define this to compile stream-caching support, it can be enabled via
    -cache <kilobytes> */
@@ -3031,6 +3039,7 @@ Config files successfully generated by ./configure !
 
   Install prefix: $_prefix
   Data directory: $_datadir
+  Config direct.: $_confdir
 
   Enabled optional drivers:
     Input: $_inputmodules