aboutsummaryrefslogtreecommitdiff
path: root/nix
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2016-12-18 17:42:04 +0100
committerLudovic Courtès <ludo@gnu.org>2016-12-18 17:45:44 +0100
commit5a5fc61f072eaa7fe9bfa65dbbd4c6215d88626c (patch)
tree72dd918a7f2e35a1c3ddfb0a9b5956cbd6f0bcbe /nix
parentfa54f44bb7e37af4a2152ca6b033f69071193005 (diff)
downloadguix-5a5fc61f072eaa7fe9bfa65dbbd4c6215d88626c.tar
guix-5a5fc61f072eaa7fe9bfa65dbbd4c6215d88626c.tar.gz
build: Fix .service and .conf targets for VPATH builds.
* nix/local.mk (etc/guix-%.service, etc/guix-%.conf): Use "$<", not "$(srcdir)/$<".
Diffstat (limited to 'nix')
-rw-r--r--nix/local.mk12
1 files changed, 6 insertions, 6 deletions
diff --git a/nix/local.mk b/nix/local.mk
index 6880e94193..ab8e798d7e 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 $@`"; \
- $(SED) -e 's|@''bindir''@|$(bindir)|' < \
- "$(srcdir)/$<" > "$@.tmp"; \
+ $(AM_V_GEN)$(MKDIR_P) "`dirname $@`"; \
+ $(SED) -e 's|@''bindir''@|$(bindir)|' < \
+ "$<" > "$@.tmp"; \
mv "$@.tmp" "$@"
# 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 $@`"; \
- $(SED) -e 's|@''bindir''@|$(bindir)|' < \
- "$(srcdir)/$<" > "$@.tmp"; \
+ $(AM_V_GEN)$(MKDIR_P) "`dirname $@`"; \
+ $(SED) -e 's|@''bindir''@|$(bindir)|' < \
+ "$<" > "$@.tmp"; \
mv "$@.tmp" "$@"
EXTRA_DIST += \