oysteikt
/
mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

cmdline: obey $(sysconfdir) for default mpd.conf location 

Instead of hard-coding the path "/etc/mpd.conf", use the configured
$(sysconfdir) path.  This can be set with:

 ./configure --sysconfdir=/etc

Note that this changes the default path to "/usr/local/etc/mpd.conf",
given the default prefix "/usr/local".  This is actually more correct
than the old default.
This commit is contained in:
Max Kellermann 2009-07-28 16:17:18 +02:00
parent 884201b919
commit 9322f04529
3 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.am
View File

@ -3,6 +3,8 @@ AUTOMAKE_OPTIONS = foreign 1.10 dist-bzip2
AM_CPPFLAGS = -I$(srcdir)/src $(GLIB_CFLAGS)
AM_CPPFLAGS += -DSYSTEM_CONFIG_FILE_LOCATION='"$(sysconfdir)/mpd.conf"'
bin_PROGRAMS = src/mpd
src_mpd_CFLAGS = $(AM_CFLAGS) $(MPD_CFLAGS)

1
NEWS
View File

@ -21,6 +21,7 @@ ver 0.16 (20??/??/??)
* log unused/unknown block parameters
* save state when stopped
* renamed option "--stdout" to "--stderr"
* obey $(sysconfdir) for default mpd.conf location
ver 0.15.1 (2009/07/15)

1
src/cmdline.c
View File

@ -35,7 +35,6 @@
#include <stdio.h>
#include <stdlib.h>
#define SYSTEM_CONFIG_FILE_LOCATION "/etc/mpd.conf"
#define USER_CONFIG_FILE_LOCATION1 ".mpdconf"
#define USER_CONFIG_FILE_LOCATION2 ".mpd/mpd.conf"