[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
67/155: build: Fix .service and .conf targets for VPATH builds.
From: |
John Darrington |
Subject: |
67/155: build: Fix .service and .conf targets for VPATH builds. |
Date: |
Wed, 21 Dec 2016 20:48:34 +0000 (UTC) |
jmd pushed a commit to branch wip-installer
in repository guix.
commit ab83fe39b5af6a0d6163fcc7ffb874e6ea6bbff8
Author: Ludovic Courtès <address@hidden>
Date: Sun Dec 18 17:42:04 2016 +0100
build: Fix .service and .conf targets for VPATH builds.
* nix/local.mk (etc/guix-%.service, etc/guix-%.conf): Use "$<", not
"$(srcdir)/$<".
---
nix/local.mk | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/nix/local.mk b/nix/local.mk
index 6880e94..ab8e798 100644
--- a/nix/local.mk
+++ b/nix/local.mk
@@ -189,9 +189,9 @@ nodist_systemdservice_DATA = etc/guix-daemon.service
etc/guix-publish.service
etc/guix-%.service: etc/guix-%.service.in \
$(top_builddir)/config.status
- $(AM_V_GEN)$(MKDIR_P) "`dirname address@hidden";
\
- $(SED) -e 's|@''bindir''@|$(bindir)|' < \
- "$(srcdir)/$<" > "address@hidden"; \
+ $(AM_V_GEN)$(MKDIR_P) "`dirname address@hidden"; \
+ $(SED) -e 's|@''bindir''@|$(bindir)|' < \
+ "$<" > "address@hidden"; \
mv "address@hidden" "$@"
# The '.conf' jobs for Upstart.
@@ -200,9 +200,9 @@ nodist_upstartjob_DATA = etc/guix-daemon.conf
etc/guix-publish.conf
etc/guix-%.conf: etc/guix-%.conf.in \
$(top_builddir)/config.status
- $(AM_V_GEN)$(MKDIR_P) "`dirname address@hidden";
\
- $(SED) -e 's|@''bindir''@|$(bindir)|' < \
- "$(srcdir)/$<" > "address@hidden"; \
+ $(AM_V_GEN)$(MKDIR_P) "`dirname address@hidden"; \
+ $(SED) -e 's|@''bindir''@|$(bindir)|' < \
+ "$<" > "address@hidden"; \
mv "address@hidden" "$@"
EXTRA_DIST += \
- 42/155: import cran: Add "recursive" option., (continued)
- 42/155: import cran: Add "recursive" option., John Darrington, 2016/12/21
- 32/155: profiles: Remove dependency on 'glibc-utf8-locales' for tests., John Darrington, 2016/12/21
- 31/155: gnu: bootstrap: Add FTP URL for bootstrap binaries., John Darrington, 2016/12/21
- 53/155: gnu: youtube-dl: Update to 2016.12.15., John Darrington, 2016/12/21
- 49/155: gnu: Add and use sane-backends., John Darrington, 2016/12/21
- 61/155: tests: Mock up http-fetch., John Darrington, 2016/12/21
- 57/155: gnu: yoshimi: Update to 1.5.0., John Darrington, 2016/12/21
- 56/155: tests: Mock up http-fetch in import test., John Darrington, 2016/12/21
- 48/155: gnu: Add and use sane-backends-minimal., John Darrington, 2016/12/21
- 41/155: import cran: Add recursive importer., John Darrington, 2016/12/21
- 67/155: build: Fix .service and .conf targets for VPATH builds.,
John Darrington <=
- 59/155: linux-initrd: Support FAT filesystems., John Darrington, 2016/12/21
- 55/155: gnu: emacs-org: Update to 20161214., John Darrington, 2016/12/21
- 64/155: doc: Document 'cargo-build-system'., John Darrington, 2016/12/21
- 63/155: gnu: mumble: Update to 1.2.18., John Darrington, 2016/12/21
- 68/155: gnu: maxima: Update to 5.39.0., John Darrington, 2016/12/21
- 65/155: doc: Mention the d3.js backend of 'guix graph'., John Darrington, 2016/12/21
- 71/155: gnu: gnuplot: Update to 5.0.5., John Darrington, 2016/12/21
- 83/155: doc: Make 'guix pull' more visible., John Darrington, 2016/12/21
- 85/155: services: Use 'file-append' in more places., John Darrington, 2016/12/21
- 93/155: gnu: linux-libre: Fix typo., John Darrington, 2016/12/21