From 62e2b03cb580538f8e1ed5da14f49640a39fda89 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 14 Sep 2012 13:49:42 -0500 Subject: Add build system for the apparmor profile --- Makefile.am | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'Makefile.am') diff --git a/Makefile.am b/Makefile.am index a40362d..e8cec00 100644 --- a/Makefile.am +++ b/Makefile.am @@ -40,6 +40,20 @@ uccsconfigure-session: uccsconfigure-session.in EXTRA_DIST += uccsconfigure-session.in CLEANFILES += uccsconfigure-session +############################### +# Apparmor for session script +############################### + +apparmordir = $(sysconfdir)/apparmor.d/ +apparmor_DATA = \ + lightdm-remote-session-uccsconfigure + +lightdm-remote-session-uccsconfigure: lightdm-remote-session-uccsconfigure.in + @sed -e "s|\@pkgdatadir\@|$(pkgdatadir)|" $< > $@ + +EXTRA_DIST += lightdm-remote-session-uccsconfigure.in +CLEANFILES += lightdm-remote-session-uccsconfigure + ############################### # Autostart Firefox ############################### -- cgit v1.2.3 From 3e7f9c00c55b795def0c70fd2de5fc37aa2495ca Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 14 Sep 2012 14:20:03 -0500 Subject: Add a small binary to be the wrapper --- Makefile.am | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'Makefile.am') diff --git a/Makefile.am b/Makefile.am index e8cec00..1325ca5 100644 --- a/Makefile.am +++ b/Makefile.am @@ -40,6 +40,19 @@ uccsconfigure-session: uccsconfigure-session.in EXTRA_DIST += uccsconfigure-session.in CLEANFILES += uccsconfigure-session +############################### +# The session wrapper +############################### + +pkglibexec_PROGRAMS = \ + uccsconfigure-session-wrapper + +uccsconfigure_session_wrapper_SOURCES = \ + uccsconfigure-session-wrapper.c +uccsconfigure_session_wrapper_CFLAGS = \ + -DPKGDATADIR="\"$(pkgdatadir)\"" \ + -Wall -Werror + ############################### # Apparmor for session script ############################### -- cgit v1.2.3 From 1a5fc013c97261991805c1a0b4344d0344926db9 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 14 Sep 2012 14:21:35 -0500 Subject: Make apparmor work on the wrapper --- Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Makefile.am') diff --git a/Makefile.am b/Makefile.am index 1325ca5..18c49bc 100644 --- a/Makefile.am +++ b/Makefile.am @@ -54,7 +54,7 @@ uccsconfigure_session_wrapper_CFLAGS = \ -Wall -Werror ############################### -# Apparmor for session script +# Apparmor for session wrapper ############################### apparmordir = $(sysconfdir)/apparmor.d/ @@ -62,7 +62,7 @@ apparmor_DATA = \ lightdm-remote-session-uccsconfigure lightdm-remote-session-uccsconfigure: lightdm-remote-session-uccsconfigure.in - @sed -e "s|\@pkgdatadir\@|$(pkgdatadir)|" $< > $@ + @sed -e "s|\@pkglibexecdir\@|$(pkglibexecdir)|" $< > $@ EXTRA_DIST += lightdm-remote-session-uccsconfigure.in CLEANFILES += lightdm-remote-session-uccsconfigure -- cgit v1.2.3 From 2a395d9c0920638916b45bbbdebb06f48e6ecd5c Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 14 Sep 2012 14:47:19 -0500 Subject: Making the desktop file find the wrapper --- Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile.am') diff --git a/Makefile.am b/Makefile.am index 18c49bc..b411d8e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -10,7 +10,7 @@ lightdm_session_DATA = \ uccsconfigure.desktop %.desktop: %.desktop.in - @sed -e "s|\@pkgdatadir\@|$(pkgdatadir)|" $< > $@ + @sed -e "s|\@pkglibexecdir\@|$(pkglibexecdir)|" $< > $@ EXTRA_DIST += uccsconfigure.desktop.in CLEANFILES += uccsconfigure.desktop -- cgit v1.2.3