Mercurial > mplayer.hg

diff mplayer.c @ 6545:9df67606ef53

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
author atmos4
date Mon, 24 Jun 2002 08:23:48 +0000
parents bff56f37f2ff
children eb10ce6b3f18
line wrap: on
line diff
--- 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);