[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
06/09: build: Fix instantiation of 'guix-daemon.service' when builddir !
From: |
Ludovic Courtès |
Subject: |
06/09: build: Fix instantiation of 'guix-daemon.service' when builddir != srcdir. |
Date: |
Sun, 19 Jul 2015 20:28:25 +0000 |
civodul pushed a commit to branch master
in repository guix.
commit f262f9f52dde48efcfc913a6f6dfd898bf469408
Author: Ludovic Courtès <address@hidden>
Date: Sun Jul 19 21:59:00 2015 +0200
build: Fix instantiation of 'guix-daemon.service' when builddir != srcdir.
* daemon.am (etc/guix-daemon.service): Add $(MKDIR_P) invocation. Add
$(srcdir) when referring to the source file.
---
daemon.am | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/daemon.am b/daemon.am
index 6a031a1..f2cb0a4 100644
--- a/daemon.am
+++ b/daemon.am
@@ -186,8 +186,9 @@ nodist_systemdservice_DATA = etc/guix-daemon.service
etc/guix-daemon.service: etc/guix-daemon.service.in \
$(top_builddir)/config.status
- $(SED) -e 's|@''bindir''@|$(bindir)|' < \
- "etc/guix-daemon.service.in" > "address@hidden"
+ $(MKDIR_P) "`dirname "$@"`"
+ $(SED) -e 's|@''bindir''@|$(bindir)|' < \
+ "$(srcdir)/etc/guix-daemon.service.in" > "address@hidden"
mv "address@hidden" "$@"
EXTRA_DIST += \
- branch master updated (5ede5f2 -> 50c7a1e), Ludovic Courtès, 2015/07/19
- 02/09: build: Adjust 'gen-AUTHORS' for 'distcheck' and when run from a tarball., Ludovic Courtès, 2015/07/19
- 01/09: AUTHORS: Remove the hand-made list of people., Ludovic Courtès, 2015/07/19
- 05/09: build: Do not distribute the daemon's 'schema.sql.hh' file., Ludovic Courtès, 2015/07/19
- 03/09: build: Add 'generate-authors.scm' to the distribution., Ludovic Courtès, 2015/07/19
- 07/09: build: Ensure man pages are not rebuilt by users., Ludovic Courtès, 2015/07/19
- 06/09: build: Fix instantiation of 'guix-daemon.service' when builddir != srcdir.,
Ludovic Courtès <=
- 04/09: build: Build coreutils-size-map.eps for the sake of the PS and DVI outputs., Ludovic Courtès, 2015/07/19
- 08/09: nls: Add package files for translation., Ludovic Courtès, 2015/07/19
- 09/09: gnu: Add gnu-c-manual., Ludovic Courtès, 2015/07/19