[apparmor] [patch 6/6] add apparmor.vim install target to utils/ install
John Johansen
john.johansen at canonical.com
Thu Mar 22 18:51:17 UTC 2012
On 03/22/2012 10:06 AM, Steve Beattie wrote:
> This patch adds a make install target for the generated apparmor.vim
> file, installing by default into /usr/share/apparmor based on IRC
> discussions; alternate suggestions welcome. (Installing directly
> into the vim syntax tree is difficult as the system path by default
> contains the vim version number.)
>
> This is kept as a separate patch in case it's felt that it's too late
> in the dev cycle to add an additional installed file, even if it's
> one that won't get automatically used by anything.
>
So I am okay with this, I'll defer to others whether its to late in
the dev cycle, but I think its okay for a leaf item like this
Acked-by: John Johansen <john.johansen at canonical.com>
> ---
> utils/Makefile | 1 +
> utils/vim/Makefile | 7 +++++++
> 2 files changed, 8 insertions(+)
>
> Index: b/utils/Makefile
> ===================================================================
> --- a/utils/Makefile
> +++ b/utils/Makefile
> @@ -60,6 +60,7 @@ install: ${MANPAGES} ${HTMLMANPAGES}
> install -m 644 ${MODULES} ${PERLDIR}
> $(MAKE) -C po install DESTDIR=${DESTDIR} NAME=${NAME}
> $(MAKE) install_manpages DESTDIR=${DESTDIR}
> + $(MAKE) -C vim install DESTDIR=${DESTDIR}
> ln -sf aa-status.8 ${DESTDIR}/${MANDIR}/man8/apparmor_status.8
>
> .PHONY: clean
> Index: b/utils/vim/Makefile
> ===================================================================
> --- a/utils/vim/Makefile
> +++ b/utils/vim/Makefile
> @@ -9,10 +9,17 @@ common/Make.rules: $(COMMONDIR)/Make.rul
> ln -sf $(COMMONDIR) .
> endif
>
> +VIM_INSTALL_PATH=${DESTDIR}/usr/share/apparmor
> +
> all: apparmor.vim
>
> apparmor.vim: apparmor.vim.in Makefile create-apparmor.vim.py
> python create-apparmor.vim.py > $@
>
> +install: apparmor.vim
> + install -d $(VIM_INSTALL_PATH)
> + install -m 644 $< $(VIM_INSTALL_PATH)
> +
> +
> clean:
> rm -f apparmor.vim
>
>
> -- AppArmor mailing list AppArmor at lists.ubuntu.com Modify settings or unsubscribe at: https://lists.ubuntu.com/mailman/listinfo/apparmor
>
More information about the AppArmor
mailing list