# HG changeset patch
# User atmos4
# Date 1024907028 0
# Node ID 9df67606ef539806ea68b2575c30100feb616ed7
# Parent  222f6da66fa329ae5bdfd5761c0225c226636f7e
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

diff -r 222f6da66fa3 -r 9df67606ef53 configure
--- a/configure	Mon Jun 24 08:13:31 2002 +0000
+++ b/configure	Mon Jun 24 08:23:48 2002 +0000
@@ -4002,10 +4002,11 @@
 
 LANG = C
 TARGET_OS = $system_name
-prefix = $_prefix
-DATADIR = $_datadir
-CONFDIR = $_confdir
-LIBDIR = $_libdir
+DESTDIR =
+prefix = \$(DESTDIR)$_prefix
+DATADIR = \$(DESTDIR)$_datadir
+CONFDIR = \$(DESTDIR)$_confdir
+LIBDIR = \$(DESTDIR)$_libdir
 #AR = ar
 CC = $_cc
 AWK = $_awk
diff -r 222f6da66fa3 -r 9df67606ef53 input/input.c
--- a/input/input.c	Mon Jun 24 08:13:31 2002 +0000
+++ b/input/input.c	Mon Jun 24 08:23:48 2002 +0000
@@ -298,7 +298,7 @@
 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;
 
diff -r 222f6da66fa3 -r 9df67606ef53 mplayer.c
--- a/mplayer.c	Mon Jun 24 08:13:31 2002 +0000
+++ b/mplayer.c	Mon Jun 24 08:23:48 2002 +0000
@@ -421,7 +421,7 @@
 {
 char *conffile;
 int conffile_fd;
-if (m_config_parse_config_file(conf, "/etc/mplayer.conf") < 0)
+if (m_config_parse_config_file(conf, CONFDIR"/mplayer.conf") < 0)
   exit(1);
 if ((conffile = get_path("")) == NULL) {
   mp_msg(MSGT_CPLAYER,MSGL_WARN,MSGTR_NoHomeDir);