[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
04/04: build: Fix .service and .conf targets for VPATH builds.
From: |
Ludovic Courtès |
Subject: |
04/04: build: Fix .service and .conf targets for VPATH builds. |
Date: |
Sun, 18 Dec 2016 16:45:54 +0000 (UTC) |
civodul pushed a commit to branch master
in repository guix.
commit 5a5fc61f072eaa7fe9bfa65dbbd4c6215d88626c
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 += \