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

1 files changed, 1 insertions, 1 deletions

diff --git a/mplayer.c b/mplayer.c
index a517fe2362..7841cb7e3e 100644
--- a/mplayer.c
+++ b/mplayer.c
@@ -421,7 +421,7 @@ void parse_cfgfiles( m_config_t* conf )
 {
 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);