diff options
author | Marius Bakke <mbakke@fastmail.com> | 2020-03-11 22:58:11 +0100 |
---|---|---|
committer | Marius Bakke <mbakke@fastmail.com> | 2020-03-11 22:58:11 +0100 |
commit | 41c6e4f2b40f41cdbf4e8c7ade29845709f9cdf4 (patch) | |
tree | f496dcc2b11819f691cfe6063c52894f2ca76823 /nix | |
parent | 4510aeb91ce6267a14c9cead768869553b3a2279 (diff) | |
parent | 58363ee50096fd02743ff6d62ee1125fc440625f (diff) | |
download | guix-patches-41c6e4f2b40f41cdbf4e8c7ade29845709f9cdf4.tar guix-patches-41c6e4f2b40f41cdbf4e8c7ade29845709f9cdf4.tar.gz |
Merge branch 'master' into staging
Diffstat (limited to 'nix')
-rw-r--r-- | nix/local.mk | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/nix/local.mk b/nix/local.mk index dc5a8398b2..a64bdd2137 100644 --- a/nix/local.mk +++ b/nix/local.mk @@ -164,6 +164,16 @@ etc/guix-%.service: etc/guix-%.service.in \ "$<" > "$@.tmp"; \ mv "$@.tmp" "$@" +sysvinitservicedir = $(sysconfdir)/init.d +nodist_sysvinitservice_DATA = etc/init.d/guix-daemon + +etc/init.d/guix-daemon: etc/init.d/guix-daemon.in \ + $(top_builddir)/config.status + $(AM_V_GEN)$(MKDIR_P) "`dirname $@`"; \ + $(SED) -e 's|@''localstatedir''@|$(localstatedir)|' < \ + "$<" > "$@.tmp"; \ + mv "$@.tmp" "$@" + # The '.conf' jobs for Upstart. upstartjobdir = $(libdir)/upstart/system nodist_upstartjob_DATA = etc/guix-daemon.conf etc/guix-publish.conf @@ -177,7 +187,8 @@ etc/guix-%.conf: etc/guix-%.conf.in \ CLEANFILES += \ $(nodist_systemdservice_DATA) \ - $(nodist_upstartjob_DATA) + $(nodist_upstartjob_DATA) \ + $(nodist_sysvinitservice_DATA) EXTRA_DIST += \ %D%/AUTHORS \ @@ -185,7 +196,8 @@ EXTRA_DIST += \ etc/guix-daemon.service.in \ etc/guix-daemon.conf.in \ etc/guix-publish.service.in \ - etc/guix-publish.conf.in + etc/guix-publish.conf.in \ + etc/init.d/guix-daemon.in if CAN_RUN_TESTS |