Look for the shairport-sync.conf in the directory specified by the sysconfdir directo...

diff --git a/Makefile.am b/Makefile.am
index 764db2da53b1e3f6bcab2f84211be1c68c3825ef..3ad626090ba57c7ba63b210aa1a9eb35ed8e57a8 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,7 +3,7 @@ SUBDIRS = man
 bin_PROGRAMS = shairport-sync
 shairport_sync_SOURCES = shairport.c rtsp.c mdns.c mdns_external.c common.c rtp.c player.c alac.c audio.c 
 
-AM_CFLAGS = -Wno-multichar
+AM_CFLAGS = -Wno-multichar -DSYSCONFDIR=\"$(sysconfdir)\"
 
 if USE_CUSTOMPIDDIR
 AM_CFLAGS+= \

diff --git a/shairport.c b/shairport.c
index 72ea8d0c0cb0548f1f9642eef0c9ddccefbd81b7..09cd5910fe4f5e9251f303eb2c5ac0f6a28238f7 100644 (file)
--- a/shairport.c
+++ b/shairport.c
@@ -151,6 +151,8 @@ char* get_version_string() {
   #ifdef CONFIG_METADATA
     strcat(version_string, "-metadata");
   #endif
+    strcat(version_string, "-settingsdir:");
+    strcat(version_string, SYSCONFDIR);
   }
   return version_string;
 }
@@ -729,7 +731,8 @@ int main(int argc, char **argv) {
     endianness = SS_BIG_ENDIAN;
   else die("Can not recognise the endianness of the processor.");
   
-  strcpy(configuration_file_path, "/etc/");
+  strcpy(configuration_file_path, SYSCONFDIR);
+  strcat(configuration_file_path, "/");
   strcat(configuration_file_path, appName);
   strcat(configuration_file_path, ".conf");
   config.configfile = configuration_file_path;