From c9b1ee48195545db4bc0c4dd8634281d705e9a7b Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 21 Aug 2014 09:37:28 +0200 Subject: [PATCH] polkit: use make_dirs; only install systemd files if the systemd option is enabled. --- srcpkgs/polkit/template | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/srcpkgs/polkit/template b/srcpkgs/polkit/template index 5803a4117c..d5db30a291 100644 --- a/srcpkgs/polkit/template +++ b/srcpkgs/polkit/template @@ -1,11 +1,9 @@ # Template file for 'polkit' pkgname=polkit version=0.112 -revision=4 +revision=5 build_style=gnu-configure -configure_args="--disable-static --with-authfw=pam - --with-systemdsystemunitdir=/usr/lib/systemd/system --with-os-type=void - --with-mozjs=mozjs-17.0" +configure_args="--disable-static --with-authfw=pam --with-os-type=void --with-mozjs=mozjs-17.0" short_desc="Authorization Toolkit" maintainer="Juan RP " homepage="http://www.freedesktop.org/wiki/Software/polkit" @@ -16,6 +14,9 @@ checksum=d695f43cba4748a822fbe864dd32c4887c5da1c71694a47693ace5e88fcf6af6 hostmakedepends="pkg-config intltool libxslt docbook-xsl glib-devel" makedepends="libglib-devel expat-devel pam-devel mozjs17-devel" system_accounts="polkitd" +make_dirs=" + /etc/polkit-1/rules.d 0700 polkitd polkitd + /usr/share/polkit-1/rules.d 0700 polkitd polkitd" # Package build options build_options="gir systemd" @@ -34,7 +35,7 @@ else fi if [ "$build_option_systemd" ]; then - configure_args+=" --enable-systemd --enable-libsystemd-login" + configure_args+=" --enable-systemd --enable-libsystemd-login --with-systemdsystemunitdir=/usr/lib/systemd/system" makedepends+=" systemd-devel" else configure_args+=" --disable-systemd --disable-libsystemd-login" @@ -56,7 +57,9 @@ post_configure() { post_install() { vinstall ${FILESDIR}/polkit-1.pam 644 etc/pam.d polkit-1 - vinstall ${FILESDIR}/polkit.tmpfiles 644 usr/lib/tmpfiles.d polkit.conf + if [ "$build_option_systemd" ]; then + vinstall ${FILESDIR}/polkit.tmpfiles 644 usr/lib/tmpfiles.d polkit.conf + fi } polkit-devel_package() {