[pacman-contrib] [PATCH] paccache.service: Use actual bindir rather than hardcode /usr/bin

[Johannes Löthberg]

Signed-off-by: Johannes Löthberg <johannes at kyriasis.com>
---
 src/Makefile.am                               | 8 ++++++--
 src/{paccache.service => paccache.service.in} | 2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)
 rename src/{paccache.service => paccache.service.in} (68%)

diff --git a/src/Makefile.am b/src/Makefile.am
index 4151c7d..c992f68 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -44,9 +44,12 @@ OURSCRIPTS = \
 	$(BASHSCRIPTS) \
 	$(PERLSCRIPTS)
 
+OURFILES = \
+	paccache.service
+
 EXTRA_DIST = \
 	checkupdates.sh.in \
-	paccache.service \
+	paccache.service.in \
 	paccache.sh.in \
 	paccache.timer \
 	pacdiff.sh.in \
@@ -84,6 +87,7 @@ AM_CFLAGS = \
 	$(LIBALPM_CFLAGS)
 
 edit = sed \
+	-e 's|@bindir[@]|${bindir}|g' \
 	-e 's|@sysconfdir[@]|$(sysconfdir)|g' \
 	-e 's|@localstatedir[@]|$(localstatedir)|g' \
 	-e 's|@PACKAGE_VERSION[@]|$(REAL_PACKAGE_VERSION)|g' \
@@ -110,7 +114,7 @@ $(OURFILES): Makefile
 	$(AM_V_at)chmod a-w $@.tmp
 	$(AM_V_at)mv $@.tmp $@
 
-all-am: $(OURSCRIPTS)
+all-am: $(OURSCRIPTS) $(OURFILES)
 
 checkupdates: $(srcdir)/checkupdates.sh.in $(top_srcdir)/lib/output_format.sh $(top_srcdir)/lib/term_colors.sh
 paccache: $(srcdir)/paccache.sh.in $(top_srcdir)/lib/output_format.sh $(top_srcdir)/lib/parseopts.sh $(top_srcdir)/lib/size_to_human.sh $(top_srcdir)/lib/term_colors.sh
diff --git a/src/paccache.service b/src/paccache.service.in
similarity index 68%
rename from src/paccache.service
rename to src/paccache.service.in
index bd86faf..919bf74 100644
--- a/src/paccache.service
+++ b/src/paccache.service.in
@@ -3,4 +3,4 @@ Description=Discard unused packages
 
 [Service]
 Type=oneshot
-ExecStart=/usr/bin/paccache -r
+ExecStart=@bindir@/paccache -r
-- 
2.15.0