From ad227484c3e1dc85488be76a23128e77ad0b33ff Mon Sep 17 00:00:00 2001 From: Mario Daniel Ruiz Saavedra Date: Thu, 26 Nov 2015 11:07:51 -0500 Subject: Add 'guix-daemon.conf' job for Upstart. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * etc/guix-daemon.conf.in: New file. * daemon.am (CLEANFILES): Add etc/guix-daemon.conf. (upstartjobdir, nodist_upstartjob_DATA): New variables. (EXTRA_DIST): Add etc/guix-daemon.conf.in. * doc/guix.texi (Binary Installation, Build Environment Setup): Mention 'guix-daemon.conf'. Signed-off-by: Mario Daniel Ruiz Saavedra Signed-off-by: Ludovic Courtès --- daemon.am | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) (limited to 'daemon.am') diff --git a/daemon.am b/daemon.am index f2cb0a499e..f75eef2e98 100644 --- a/daemon.am +++ b/daemon.am @@ -21,7 +21,7 @@ # BUILT_SOURCES += nix/libstore/schema.sql.hh -CLEANFILES += $(BUILT_SOURCES) etc/guix-daemon.service +CLEANFILES += $(BUILT_SOURCES) etc/guix-daemon.service etc/guix-daemon.conf noinst_LIBRARIES = libformat.a libutil.a libstore.a @@ -191,11 +191,23 @@ etc/guix-daemon.service: etc/guix-daemon.service.in \ "$(srcdir)/etc/guix-daemon.service.in" > "$@.tmp" mv "$@.tmp" "$@" +# The '.conf' job for Upstart. +upstartjobdir = $(libdir)/upstart/system +nodist_upstartjob_DATA = etc/guix-daemon.conf + +etc/guix-daemon.conf: etc/guix-daemon.conf.in \ + $(top_builddir)/config.status + $(MKDIR_P) "`dirname "$@"`" + $(SED) -e 's|@''bindir''@|$(bindir)|' < \ + "$(srcdir)/etc/guix-daemon.conf.in" > "$@.tmp" + mv "$@.tmp" "$@" + EXTRA_DIST += \ nix/libstore/schema.sql \ nix/AUTHORS \ nix/COPYING \ - etc/guix-daemon.service.in + etc/guix-daemon.service.in \ + etc/guix-daemon.conf.in AM_TESTS_ENVIRONMENT += \ top_builddir="$(abs_top_builddir)" -- cgit v1.2.3