From e2e1e0addb6697f672c70ae7d65ba012bb990715 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Asbj=C3=B8rn=20Apeland?= Date: Tue, 20 Nov 2018 09:55:09 +0100 Subject: [PATCH] Makefile: use envsubst for processing .in files --- Makefile | 16 ++++------------ contrib/systemd/btrbk.service.in | 2 +- 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/Makefile b/Makefile index 8beb598..84f88d8 100644 --- a/Makefile +++ b/Makefile @@ -20,16 +20,8 @@ SYSTEMDDIR = $(PREFIX)/lib/systemd/system MAN1DIR = $(PREFIX)/share/man/man1 MAN5DIR = $(PREFIX)/share/man/man5 -replace_vars = sed \ - -e "s|@PN@|$(PN)|g" \ - -e "s|@CONFDIR@|$(CONFDIR)|g" \ - -e "s|@CRONDIR@|$(CRONDIR)|g" \ - -e "s|@BINDIR@|$(BINDIR)|g" \ - -e "s|@DOCDIR@|$(DOCDIR)|g" \ - -e "s|@SCRIPTDIR@|$(SCRIPTDIR)|g" \ - -e "s|@SYSTEMDDIR@|$(SYSTEMDDIR)|g" \ - -e "s|@MAN1DIR@|$(MAN1DIR)|g" \ - -e "s|@MAN5DIR@|$(MAN5DIR)|g" +# make variables accessible to `envsubst` +.EXPORT_ALL_VARIABLES: all: man @@ -48,8 +40,8 @@ install-etc: install-systemd: @echo 'installing systemd service units...' install -d -m 755 "$(DESTDIR)$(SYSTEMDDIR)" - $(replace_vars) contrib/systemd/btrbk.service.in > contrib/systemd/btrbk.service.tmp - $(replace_vars) contrib/systemd/btrbk.timer.in > contrib/systemd/btrbk.timer.tmp + envsubst < contrib/systemd/btrbk.service.in > contrib/systemd/btrbk.service.tmp + envsubst < contrib/systemd/btrbk.timer.in > contrib/systemd/btrbk.timer.tmp install -p -m 644 contrib/systemd/btrbk.service.tmp "$(DESTDIR)$(SYSTEMDDIR)/btrbk.service" install -p -m 644 contrib/systemd/btrbk.timer.tmp "$(DESTDIR)$(SYSTEMDDIR)/btrbk.timer" rm contrib/systemd/btrbk.service.tmp diff --git a/contrib/systemd/btrbk.service.in b/contrib/systemd/btrbk.service.in index 0f36f41..1165d11 100644 --- a/contrib/systemd/btrbk.service.in +++ b/contrib/systemd/btrbk.service.in @@ -4,4 +4,4 @@ Documentation=man:btrbk(1) [Service] Type=oneshot -ExecStart=@BINDIR@/btrbk run +ExecStart=${BINDIR}/btrbk run