[Mplayer-cvslog] CVS: main mplayer.c,1.516,1.517 configure,1.514,1.515

[Atmosfear]

Update of /cvsroot/mplayer/main
In directory mail:/var/tmp.root/cvs-serv4107

Modified Files:
	mplayer.c configure 
Log Message:
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


Index: mplayer.c
===================================================================
RCS file: /cvsroot/mplayer/main/mplayer.c,v
retrieving revision 1.516
retrieving revision 1.517
diff -u -r1.516 -r1.517
--- mplayer.c	14 Jun 2002 17:40:36 -0000	1.516
+++ mplayer.c	24 Jun 2002 08:23:47 -0000	1.517
@@ -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);

Index: configure
===================================================================
RCS file: /cvsroot/mplayer/main/configure,v
retrieving revision 1.514
retrieving revision 1.515
diff -u -r1.514 -r1.515
--- configure	16 Jun 2002 14:03:53 -0000	1.514
+++ configure	24 Jun 2002 08:23:47 -0000	1.515
@@ -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