summaryrefslogtreecommitdiffstats
path: root/input
diff options
context:
space:
mode:
authoratmos4 <atmos4@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-06-24 08:23:48 +0000
committeratmos4 <atmos4@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-06-24 08:23:48 +0000
commite3f40cf939ab53b94ab56262869ebaa0c5039be9 (patch)
tree6c4bee663200df9b6bbe6af9b1abad13766c5985 /input
parentc9ab15ec9b1dc34cb6e30d5d299b059dd6b501a5 (diff)
downloadmpv-e3f40cf939ab53b94ab56262869ebaa0c5039be9.tar.bz2
mpv-e3f40cf939ab53b94ab56262869ebaa0c5039be9.tar.xz
Patch by Dominik Mierzejewski:
The first one makes CONFDIR work correctly at last and the second adds DESTDIR to ./configure, so that it generates a relocateable Makefile and then a packager needs only to do make DESTDIR=$RPM_BUILD_ROOT install git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6546 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'input')
-rw-r--r--input/input.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/input/input.c b/input/input.c
index 55bb6ad979..ed26c0d94d 100644
--- a/input/input.c
+++ b/input/input.c
@@ -298,7 +298,7 @@ static mp_cmd_t* ar_cmd = NULL;
static unsigned int ar_delay = 100, ar_rate = 8, last_ar = 0;
static int use_joystick = 1, use_lirc = 1;
-static char* config_file = "input.conf";
+static char* config_file = CONFDIR"/input.conf";
static char* js_dev = NULL;