User $PREFIX in the init file

diff --git a/.gitignore b/.gitignore
index 261468a61cf9b740c1b1153cbf9f72bb846e7d01..cdbef556661da554433d92867223dc56dfcc3559 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -20,3 +20,4 @@ stamp-h1
 man/Makefile
 man/Makefile.in
 scripts/shairport-sync.service
+scripts/shairport-sync
\ No newline at end of file

diff --git a/configure.ac b/configure.ac
index ba31af0df2500378dde50506e5658384579c1380..75e4db9e079fa6ed9468f200134d80d93615e2b4 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -256,4 +256,5 @@ AC_FUNC_REALLOC
 AC_CHECK_FUNCS([atexit clock_gettime gethostname inet_ntoa memchr memmove memset mkfifo pow select socket stpcpy strcasecmp strchr strdup strerror strstr strtol strtoul])
 
 AC_CONFIG_FILES([Makefile man/Makefile scripts/shairport-sync.service])
+AC_CONFIG_FILES([scripts/shairport-sync],[chmod +x scripts/shairport-sync])
 AC_OUTPUT

diff --git a/scripts/shairport-sync b/scripts/shairport-sync.in
similarity index 99%
rename from scripts/shairport-sync
rename to scripts/shairport-sync.in
index d1175504c61a32aaee24efe3b9f0c6222e75b350..7e0dd767d4c567371ae06784556824b571b848d2 100755 (executable)
--- a/scripts/shairport-sync
+++ b/scripts/shairport-sync.in
@@ -17,7 +17,7 @@
 PATH=/sbin:/usr/sbin:/bin:/usr/bin
 DESC="AirPlay Synchronous Audio Service"
 NAME=shairport-sync
-DAEMON=/usr/local/bin/$NAME
+DAEMON=@prefix@/bin/$NAME
 
 # We don't use the DAEMON_ARGS variable here because some of the identifiers may have spaces in them, and so are
 # impossible to pass as arguments.