Michael has proposed merging lp:~kensington/apparmor/vim-man into lp:apparmor.
Requested reviews:
AppArmor Developers (apparmor-dev)
For more details, see:
https://code.launchpad.net/~kensington/apparmor/vim-man/+merge/172201
Move apparmor.vim.5 from parser to utils, since apparmor.vim already lives
there. It makes more sense to keep them together.
--
https://code.launchpad.net/~kensington/apparmor/vim-man/+merge/172201
Your team AppArmor Developers is requested to review the proposed merge of
lp:~kensington/apparmor/vim-man into lp:apparmor.
=== modified file 'parser/Makefile'
--- parser/Makefile 2013-01-13 13:10:41 +0000
+++ parser/Makefile 2013-06-29 14:32:23 +0000
@@ -31,7 +31,7 @@
CONFDIR=/etc/apparmor
INSTALL_CONFDIR=${DESTDIR}${CONFDIR}
LOCALEDIR=/usr/share/locale
-MANPAGES=apparmor.d.5 apparmor.7 apparmor_parser.8 subdomain.conf.5 apparmor.vim.5
+MANPAGES=apparmor.d.5 apparmor.7 apparmor_parser.8 subdomain.conf.5
YACC := /usr/bin/bison
YFLAGS := -d
=== modified file 'utils/vim/Makefile'
--- utils/vim/Makefile 2012-06-12 13:28:41 +0000
+++ utils/vim/Makefile 2013-06-29 14:32:23 +0000
@@ -9,16 +9,20 @@
ln -sf $(COMMONDIR) .
endif
+MANPAGES=apparmor.vim.5
VIM_INSTALL_PATH=${DESTDIR}/usr/share/apparmor
-all: apparmor.vim
+all: apparmor.vim manpages
apparmor.vim: apparmor.vim.in Makefile create-apparmor.vim.py
${PYTHON} create-apparmor.vim.py > apparmor.vim
-install: apparmor.vim
+manpages: $(MANPAGES)
+
+install: apparmor.vim manpages
install -d $(VIM_INSTALL_PATH)
install -m 644 $< $(VIM_INSTALL_PATH)
+ $(MAKE) install_manpages DESTDIR=${DESTDIR}
test: apparmor.vim.in Makefile create-apparmor.vim.py
#Testing with all pythons
=== renamed file 'parser/apparmor.vim.pod' => 'utils/vim/apparmor.vim.pod'
--
AppArmor mailing list
[email protected]
Modify settings or unsubscribe at:
https://lists.ubuntu.com/mailman/listinfo/apparmor
