From 2745f0e08e4fe6f7d83d7c15542aaf337b3834d0 Mon Sep 17 00:00:00 2001 From: Andrea Bolognani Date: Wed, 9 Jan 2019 18:14:34 +0100 Subject: [PATCH] remote: Define polkit{actions,rules}dir Avoid building the same path several times. Signed-off-by: Andrea Bolognani Reviewed-by: Erik Skultety --- src/remote/Makefile.inc.am | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/src/remote/Makefile.inc.am b/src/remote/Makefile.inc.am index 04a2ec8cc0..bb5997b85f 100644 --- a/src/remote/Makefile.inc.am +++ b/src/remote/Makefile.inc.am @@ -207,21 +207,23 @@ uninstall-sysctl: endif ! WITH_SYSCTL if WITH_POLKIT -policydir = $(datadir)/polkit-1/actions +polkitdir = $(datadir)/polkit-1 +polkitactionsdir = $(polkitdir)/actions +polkitrulesdir = $(polkitdir)/rules.d install-polkit:: - $(MKDIR_P) $(DESTDIR)$(policydir) + $(MKDIR_P) $(DESTDIR)$(polkitactionsdir) $(INSTALL_DATA) $(srcdir)/remote/libvirtd.policy \ - $(DESTDIR)$(policydir)/org.libvirt.unix.policy - $(MKDIR_P) $(DESTDIR)$(datadir)/polkit-1/rules.d + $(DESTDIR)$(polkitactionsdir)/org.libvirt.unix.policy + $(MKDIR_P) $(DESTDIR)$(polkitrulesdir) $(INSTALL_DATA) $(srcdir)/remote/libvirtd.rules \ - $(DESTDIR)$(datadir)/polkit-1/rules.d/50-libvirt.rules + $(DESTDIR)$(polkitrulesdir)/50-libvirt.rules uninstall-polkit:: - rm -f $(DESTDIR)$(policydir)/org.libvirt.unix.policy - rmdir $(DESTDIR)$(policydir) || : - rm -f $(DESTDIR)$(datadir)/polkit-1/rules.d/50-libvirt.rules - rmdir $(DESTDIR)$(datadir)/polkit-1/rules.d || : + rm -f $(DESTDIR)$(polkitactionsdir)/org.libvirt.unix.policy + rmdir $(DESTDIR)$(polkitactionsdir) || : + rm -f $(DESTDIR)$(polkitrulesdir)/50-libvirt.rules + rmdir $(DESTDIR)$(polkitrulesdir) || : else ! WITH_POLKIT install-polkit::