With the conversion of the python utils, aa-easyprof got added to the
list of tools to be installed (in /usr/sbin/), but is already installed
(in /usr/bin) by the python-tools-setup.py distutils script, leaving two
copies of the tool in place. This patch filters out aa-easyprof from the
list of tools for the makefile to install itself, leaving it to
(continue to) be installed by the distutils script.

Signed-off-by: Steve Beattie <[email protected]>
---
 utils/Makefile |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Index: b/utils/Makefile
===================================================================
--- a/utils/Makefile
+++ b/utils/Makefile
@@ -54,7 +54,8 @@ install: ${MANPAGES} ${HTMLMANPAGES}
        install -m 644 logprof.conf severity.db notify.conf ${CONFDIR}
        install -d ${BINDIR}
        ln -sf aa-status ${BINDIR}/apparmor_status
-       install -m 755 ${TOOLS} ${BINDIR}
+       # aa-easyprof is installed by python-tools-setup.py
+       install -m 755 $(filter-out aa-easyprof, ${TOOLS}) ${BINDIR}
        $(MAKE) -C po install DESTDIR=${DESTDIR} NAME=${NAME}
        $(MAKE) install_manpages DESTDIR=${DESTDIR}
        $(MAKE) -C vim install DESTDIR=${DESTDIR}

-- 
Steve Beattie
<[email protected]>
http://NxNW.org/~steve/

Attachment: signature.asc
Description: Digital signature

-- 
AppArmor mailing list
[email protected]
Modify settings or unsubscribe at: 
https://lists.ubuntu.com/mailman/listinfo/apparmor

Reply via email to