diff options
| author | Lennart Poettering <lennart@poettering.net> | 2011-03-12 01:15:30 +0100 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2011-03-12 01:15:30 +0100 |
| commit | 25705583af79130d2692de297ac971f3cf165619 (patch) | |
| tree | 31ef085d558ef318a190c26565f25c34b8dea285 | |
| parent | a8f11321c209830a35edd0357e8def5d4437d854 (diff) | |
polkit: autogenerate polkit policy with correct paths
| -rw-r--r-- | Makefile.am | 9 | ||||
| -rw-r--r-- | src/org.freedesktop.systemd1.policy.in (renamed from src/org.freedesktop.systemd1.policy) | 4 |
2 files changed, 9 insertions, 4 deletions
diff --git a/Makefile.am b/Makefile.am index 7120636d9f..bb6485792a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -339,7 +339,8 @@ EXTRA_DIST = \ units/fsck-root.service.in \ units/quotacheck.service.in \ systemd.pc.in \ - introspect.awk + introspect.awk \ + src/org.freedesktop.systemd1.policy.in if TARGET_FEDORA dist_systemunit_DATA += \ @@ -386,7 +387,7 @@ dist_doc_DATA = \ pkgconfigdata_DATA = \ systemd.pc -dist_polkitpolicy_DATA = \ +polkitpolicy_DATA = \ src/org.freedesktop.systemd1.policy noinst_LTLIBRARIES = \ @@ -1069,6 +1070,7 @@ SED_PROCESS = \ $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \ $(SED) -e 's,@rootlibexecdir\@,$(rootlibexecdir),g' \ -e 's,@rootbindir\@,$(rootbindir),g' \ + -e 's,@bindir\@,$(bindir),g' \ -e 's,@SPECIAL_SYSLOG_SERVICE\@,$(SPECIAL_SYSLOG_SERVICE),g' \ -e 's,@SYSTEMCTL\@,$(rootbindir)/systemctl,g' \ -e 's,@SYSTEMD_NOTIFY\@,$(rootbindir)/systemd-notify,g' \ @@ -1090,6 +1092,9 @@ man/%: man/%.in Makefile %.pc: %.pc.in Makefile $(SED_PROCESS) +src/%.policy: src/%.policy.in Makefile + $(SED_PROCESS) + M4_PROCESS_SYSTEM = \ $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \ $(M4) -P $(M4_DISTRO_FLAG) -DFOR_SYSTEM=1 < $< > $@ || rm $@ diff --git a/src/org.freedesktop.systemd1.policy b/src/org.freedesktop.systemd1.policy.in index a9958c2e33..b8b354726b 100644 --- a/src/org.freedesktop.systemd1.policy +++ b/src/org.freedesktop.systemd1.policy.in @@ -24,7 +24,7 @@ <allow_inactive>no</allow_inactive> <allow_active>auth_admin_keep</allow_active> </defaults> - <annotate key="org.freedesktop.policykit.exec.path">/lib/systemd/systemd-reply-password</annotate> + <annotate key="org.freedesktop.policykit.exec.path">@rootlibexecdir@/systemd-reply-password</annotate> </action> <action id="org.freedesktop.systemd1.BusAccess"> @@ -35,7 +35,7 @@ <allow_inactive>no</allow_inactive> <allow_active>auth_admin_keep</allow_active> </defaults> - <annotate key="org.freedesktop.policykit.exec.path">/usr/bin/systemd-stdio-bridge</annotate> + <annotate key="org.freedesktop.policykit.exec.path">@bindir@/systemd-stdio-bridge</annotate> </action> </policyconfig> |