Install apparmor correctly to fix distcheck

diff --git a/.bzrignore b/.bzrignore
index 894064c0e51139aaa9d718dd6f503c167992a619..a1361ddc0ab5308f5fde8c1d7047ec16ce8895b8 100644 (file)
--- a/.bzrignore
+++ b/.bzrignore
@@ -28,6 +28,7 @@ Makefile.in.in
 ./mkinstalldirs
 ./omf.make
 ./xmldocs.make
+data/apparmor/lightdm-guest-session
 doc/html
 doc/lightdm-gobject-*.*
 doc/*.stamp

diff --git a/data/Makefile.am b/data/Makefile.am
index d71f09139e55aa0a233ef32fd002de21a7389e92..2c4fd420f9b344343e3a0c359badc572de7852f6 100644 (file)
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -11,24 +11,22 @@ dist_pam_DATA = pam/lightdm \
                 pam/lightdm-autologin \
                 pam/lightdm-greeter
 
-EXTRA_DIST = guest-session.apparmor \
-             guest-session.apparmor_abstraction \
-             guest-session.apparmor_chromium_abstraction
+apparmor/lightdm-guest-session: $(srcdir)/apparmor/lightdm-guest-session.in
+       sed -e 's|@pkglibexecdir[@]|$(pkglibexecdir)|g' $< >$@
 
 apparmor_profiledir = $(sysconfdir)/apparmor.d
+dist_apparmor_profile_DATA = \
+    apparmor/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
-       install -d $(DESTDIR)$(apparmor_profiledir)/abstractions
-       install --mode=0644 $(srcdir)/guest-session.apparmor_abstraction \
-               $(DESTDIR)$(apparmor_profiledir)/abstractions/lightdm
-       install --mode=0644 $(srcdir)/guest-session.apparmor_chromium_abstraction \
-               $(DESTDIR)$(apparmor_profiledir)/abstractions/lightdm_chromium-browser
+apparmor_profile_abstractionsdir = $(apparmor_profiledir)/abstractions
+dist_apparmor_profile_abstractions_DATA = \
+    apparmor/abstractions/lightdm \
+    apparmor/abstractions/lightdm_chromium-browser
 
 dist_man1_MANS = lightdm.1 \
                  lightdm-set-defaults.1
 
+CLEANFILES = apparmor/lightdm-guest-session
+
 DISTCLEANFILES = \
        Makefile.in

diff --git a/data/guest-session.apparmor_abstraction b/data/apparmor/abstractions/lightdm
similarity index 100%
rename from data/guest-session.apparmor_abstraction
rename to data/apparmor/abstractions/lightdm

diff --git a/data/guest-session.apparmor_chromium_abstraction b/data/apparmor/abstractions/lightdm_chromium-browser
similarity index 100%
rename from data/guest-session.apparmor_chromium_abstraction
rename to data/apparmor/abstractions/lightdm_chromium-browser

diff --git a/data/guest-session.apparmor b/data/apparmor/lightdm-guest-session.in
similarity index 86%
rename from data/guest-session.apparmor
rename to data/apparmor/lightdm-guest-session.in
index 7b43f77dfdd63e60778f1adecaf7b27ad3abd1f9..937a75d9d91a46e27031d6d745872ed738a16b35 100644 (file)
--- a/data/guest-session.apparmor
+++ b/data/apparmor/lightdm-guest-session.in
@@ -3,7 +3,7 @@
 
 #include <tunables/global>
 
-PKGLIBEXECDIR/lightdm-guest-session-wrapper {
+@pkglibexecdir@/lightdm-guest-session-wrapper {
   # Most applications are confined via the main abstraction
   #include <abstractions/lightdm>