jmd pushed a commit to branch wip-installer
in repository guix.
commit ab83fe39b5af6a0d6163fcc7ffb874e6ea6bbff8
Author: Ludovic Courtès <[email protected]>
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 $@`"; \
- $(SED) -e 's|@''bindir''@|$(bindir)|' < \
- "$(srcdir)/$<" > "[email protected]"; \
+ $(AM_V_GEN)$(MKDIR_P) "`dirname $@`"; \
+ $(SED) -e 's|@''bindir''@|$(bindir)|' < \
+ "$<" > "[email protected]"; \
mv "[email protected]" "$@"
# 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)/$<" > "[email protected]"; \
+ $(AM_V_GEN)$(MKDIR_P) "`dirname $@`"; \
+ $(SED) -e 's|@''bindir''@|$(bindir)|' < \
+ "$<" > "[email protected]"; \
mv "[email protected]" "$@"
EXTRA_DIST += \
