diff options
| author | Robert Ancell <robert.ancell@canonical.com> | 2013-09-11 12:36:22 +1200 |
|---|---|---|
| committer | Robert Ancell <robert.ancell@canonical.com> | 2013-09-11 12:36:22 +1200 |
| commit | 7d8c16554dceab0b30c3826adc6d88eb921be8a5 (patch) | |
| tree | 1a08dbea9e57c3552d0dd6ee0b3acd39f93e6f1c | |
| parent | be3792ac168d9fc22a880256b2fd886cc0a48305 (diff) | |
| download | lightdm-git-7d8c16554dceab0b30c3826adc6d88eb921be8a5.tar.gz | |
Install apparmor files correctly to fix distcheck
| -rw-r--r-- | data/Makefile.am | 12 | ||||
| -rw-r--r-- | data/apparmor/lightdm-guest-session.in (renamed from data/guest-session.apparmor) | 2 |
2 files changed, 8 insertions, 6 deletions
diff --git a/data/Makefile.am b/data/Makefile.am index a3cf496f..8f4ab29f 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -11,16 +11,18 @@ dist_pam_DATA = pam/lightdm \ pam/lightdm-autologin \ pam/lightdm-greeter -EXTRA_DIST = guest-session.apparmor +lightdm-guest-session: $(srcdir)/apparmor/lightdm-guest-session.in + sed -e 's|@pkglibexecdir[@]|$(pkglibexecdir)|g' $< >$@ apparmor_profiledir = $(sysconfdir)/apparmor.d +apparmor_profile_DATA = \ + lightdm-guest-session -install-data-hook: - install -d $(DESTDIR)$(apparmor_profiledir) - sed 's!PKGLIBEXECDIR!$(pkglibexecdir)!g' < $(srcdir)/guest-session.apparmor \ - > $(DESTDIR)$(apparmor_profiledir)/lightdm-guest-session dist_man1_MANS = lightdm.1 +EXTRA_DIST = apparmor/lightdm-guest-session.in +CLEANFILES = lightdm-guest-session + DISTCLEANFILES = \ Makefile.in diff --git a/data/guest-session.apparmor b/data/apparmor/lightdm-guest-session.in index 60b622f3..319064ab 100644 --- a/data/guest-session.apparmor +++ b/data/apparmor/lightdm-guest-session.in @@ -4,7 +4,7 @@ #include <tunables/global> -PKGLIBEXECDIR/lightdm-guest-session-wrapper { +@pkglibexecdir@/lightdm-guest-session-wrapper { #include <abstractions/authentication> #include <abstractions/nameservice> #include <abstractions/wutmp> |