diff options
| author | Max Kellermann <max@duempel.org> | 2009-07-28 16:17:18 +0200 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2009-07-28 16:17:18 +0200 |
| commit | 9322f04529659a01ccf313f2883f79d1525de99c (patch) | |
| tree | 173a66db5800d1187c5308d87f0302dbce92803c | |
| parent | 884201b9190946f157f2b4e2aadb5131051cbb5f (diff) | |
| download | mpd-9322f04529659a01ccf313f2883f79d1525de99c.tar.gz mpd-9322f04529659a01ccf313f2883f79d1525de99c.tar.xz mpd-9322f04529659a01ccf313f2883f79d1525de99c.zip | |
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.
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | NEWS | 1 | ||||
| -rw-r--r-- | src/cmdline.c | 1 |
3 files changed, 3 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index 0367c78ed..d2f6d6531 100644 --- 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) @@ -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) diff --git a/src/cmdline.c b/src/cmdline.c index 5216568fd..606f26674 100644 --- 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" |