From e3f40cf939ab53b94ab56262869ebaa0c5039be9 Mon Sep 17 00:00:00 2001 From: atmos4 Date: Mon, 24 Jun 2002 08:23:48 +0000 Subject: 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 --- input/input.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'input/input.c') 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; -- cgit v1.2.3