diff options
author | Mark H Weaver <mhw@netris.org> | 2015-07-19 18:12:34 -0400 |
---|---|---|
committer | Mark H Weaver <mhw@netris.org> | 2015-07-19 18:12:34 -0400 |
commit | 1b4e48d498a96d478baa1aae7d9c7ecdbd817d6f (patch) | |
tree | 4b650999e49a6f4d3dd116fab3f9ee8222247e07 /daemon.am | |
parent | aa27987f71cb8afa698ede551e20b1248f160113 (diff) | |
parent | 50c7a1e297bff0935674b4f30e854a8889becfdd (diff) | |
download | guix-1b4e48d498a96d478baa1aae7d9c7ecdbd817d6f.tar guix-1b4e48d498a96d478baa1aae7d9c7ecdbd817d6f.tar.gz |
Merge branch 'master' into core-updates
Diffstat (limited to 'daemon.am')
-rw-r--r-- | daemon.am | 17 |
1 files changed, 14 insertions, 3 deletions
@@ -21,7 +21,7 @@ # BUILT_SOURCES += nix/libstore/schema.sql.hh -CLEANFILES += $(BUILT_SOURCES) +CLEANFILES += $(BUILT_SOURCES) etc/guix-daemon.service noinst_LIBRARIES = libformat.a libutil.a libstore.a @@ -93,7 +93,6 @@ libstore_headers = \ nix/libstore/references.hh \ nix/libstore/pathlocks.hh \ nix/libstore/globals.hh \ - nix/libstore/schema.sql.hh \ nix/libstore/worker-protocol.hh \ nix/libstore/remote-store.hh \ nix/libstore/derivations.hh \ @@ -181,10 +180,22 @@ endif BUILD_DAEMON_OFFLOAD nodist_libexec_SCRIPTS = \ nix/scripts/guix-authenticate +# The '.service' file for systemd. +systemdservicedir = $(libdir)/systemd/system +nodist_systemdservice_DATA = etc/guix-daemon.service + +etc/guix-daemon.service: etc/guix-daemon.service.in \ + $(top_builddir)/config.status + $(MKDIR_P) "`dirname "$@"`" + $(SED) -e 's|@''bindir''@|$(bindir)|' < \ + "$(srcdir)/etc/guix-daemon.service.in" > "$@.tmp" + mv "$@.tmp" "$@" + EXTRA_DIST += \ nix/libstore/schema.sql \ nix/AUTHORS \ - nix/COPYING + nix/COPYING \ + etc/guix-daemon.service.in AM_TESTS_ENVIRONMENT += \ top_builddir="$(abs_top_builddir)" |