[apparmor] [patch] utils: don't install two copies of aa-easyprof

[Seth Arnold]

On Tue, Mar 25, 2014 at 02:19:03PM -0700, Steve Beattie wrote:
> 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 <steve at nxnw.org>

This does re-raise the larger question you've asked several times, if we
should allow distutils to do the installation for us -- at the price of
moving tools to /usr/bin.

I like this idea, if it is something that other potential contributors
would expect, it'd make sense to do it.

Anyway, this patch makes sense regardless.

Acked-by: Seth Arnold <seth.arnold at canonical.com>

> ---
>  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}
> 
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 490 bytes
Desc: Digital signature
URL: <https://lists.ubuntu.com/archives/apparmor/attachments/20140325/b63cbbb2/attachment.pgp>