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.

cmdline: obey $(sysconfdir) for default mpd.conf location
9322f045 · Max Kellermann · 884201b9 · 9322f045 · 9322f045 · 9322f045
Commit 9322f045 authored Jul 28, 2009 by Max Kellermann
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

Makefile.am Makefile.am +2 -0

NEWS NEWS +1 -0

cmdline.c src/cmdline.c +0 -1

No files found.
--- a/Makefile.am
+++ b/Makefile.am
@@ -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)

--- a/NEWS
+++ b/NEWS
@@ -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)

--- a/src/cmdline.c
+++ b/src/cmdline.c
@@ -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"