nils/shairport-sync
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #357 from ilovezfs/sysconfdir-dev

Browse Source 
**use `$(sysconfdir)` rather than "hardwiring" `/etc`**

This update means the build process now uses the directory path `sysconfdir` to determine where to place the configuration file `shairport-sync.conf`. The default value for `sysconfdir` is `/usr/local/etc` which is used in the BSD family, but `/etc` is normally used in Linux, so, to retain the present behaviour of Shairport Sync, you must add an extra parameter to the `./configure... ` command – the parameter you must add is `--sysconfdir=/etc`

This is one component of the updates needed to use `sysconfdir` properly. The others will be part of a subsequent commit. Also, documentation will need to be updated.
This commit is contained in:
Mike Brady
2016-08-18 11:31:47 +01:00
committed by GitHub
parent 25fafcc646 64ecb90f50
commit 5b71137f28
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Makefile.am
+5 -5
View File
@@ -52,13 +52,13 @@ endif
install-exec-hook:
if INSTALL_CONFIG_FILES
[ -e $(DESTDIR)/etc ] || mkdir $(DESTDIR)/etc
cp scripts/shairport-sync.conf $(DESTDIR)/etc/shairport-sync.conf.sample
[ -f $(DESTDIR)/etc/shairport-sync.conf ] || cp scripts/shairport-sync.conf $(DESTDIR)/etc/shairport-sync.conf
[ -e $(DESTDIR)$(sysconfdir) ] || mkdir $(DESTDIR)$(sysconfdir)
cp scripts/shairport-sync.conf $(DESTDIR)$(sysconfdir)/shairport-sync.conf.sample
[ -f $(DESTDIR)$(sysconfdir)/shairport-sync.conf ] || cp scripts/shairport-sync.conf $(DESTDIR)$(sysconfdir)/shairport-sync.conf
endif
if INSTALL_SYSTEMV
[ -e $(DESTDIR)/etc/init.d ] || mkdir -p $(DESTDIR)/etc/init.d
[ -f $(DESTDIR)/etc/init.d/shairport-sync ] || cp scripts/shairport-sync $(DESTDIR)/etc/init.d/
[ -e $(DESTDIR)$(sysconfdir)/init.d ] || mkdir -p $(DESTDIR)$(sysconfdir)/init.d
[ -f $(DESTDIR)$(sysconfdir)/init.d/shairport-sync ] || cp scripts/shairport-sync $(DESTDIR)$(sysconfdir)/init.d/
endif
if INSTALL_SYSTEMD
[ -e $(DESTDIR)$(systemdsystemunitdir) ] || mkdir -p $(DESTDIR)$(systemdsystemunitdir)