# HG changeset patch # User arpi # Date 1009317490 0 # Node ID bd99dedefa012fc06ec4eb91a5db461d59a9b121 # Parent d21bae2028a67115ae7ed78689e6eed9b927636b --confdir diff -r d21bae2028a6 -r bd99dedefa01 configure --- a/configure Tue Dec 25 20:41:04 2001 +0000 +++ b/configure Tue Dec 25 21:58:10 2001 +0000 @@ -108,7 +108,9 @@ 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 @@ --datadir=*) _datadir=`echo $ac_option | cut -d '=' -f 2` ;; + --confdir=*) + _confdir=`echo $ac_option | cut -d '=' -f 2` + ;; *) @@ -893,7 +898,7 @@ # 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 @@ 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 @@ /* 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 */ @@ -3031,6 +3039,7 @@ Install prefix: $_prefix Data directory: $_datadir + Config direct.: $_confdir Enabled optional drivers: Input: $_inputmodules