mirror of
https://gitlab.com/apparmor/apparmor.git
synced 2025-03-04 00:14:44 +01:00
utils: make html version of apparmor.vim manpage
Bug: https://bugs.launchpad.net/bugs/1366572 In the move of the apparmor.vim manpage source from the parser directory to utils/vim/, the creation of the html version of the manpage was lost. This patch fixes that, as well as fixes the vim Makefile to use the common/Make.rules _clean target (which clears the pod2htm*.tmp files created by pod2html as well). It also fixes a bug in common/Make.rules where the _clean target would report an error when used in a directory where the Makefile doesn't set the NAME variable, such as utils/vim/. Signed-off-by: Steve Beattie <steve@nxnw.org> Acked-by: Christian Boltz <apparmor@cboltz.de>
This commit is contained in:
parent
2758e2e2a1
commit
39b9985afb
2 changed files with 6 additions and 4 deletions
|
@ -172,7 +172,7 @@ $(BUILDRPMSUBDIRS):
|
|||
.PHONY: _clean
|
||||
.SILENT: _clean
|
||||
_clean:
|
||||
-rm -f ${NAME}-${VERSION}-*.tar.gz
|
||||
-[ -z "${NAME}" ] || rm -f ${NAME}-${VERSION}-*.tar.gz
|
||||
-rm -f ${MANPAGES} *.[0-9].gz ${HTMLMANPAGES} pod2htm*.tmp
|
||||
|
||||
# =====================
|
||||
|
|
|
@ -12,13 +12,15 @@ endif
|
|||
MANPAGES=apparmor.vim.5
|
||||
VIM_INSTALL_PATH=${DESTDIR}/usr/share/apparmor
|
||||
|
||||
all: apparmor.vim manpages
|
||||
all: apparmor.vim manpages htmlmanpages
|
||||
|
||||
apparmor.vim: apparmor.vim.in Makefile create-apparmor.vim.py
|
||||
${PYTHON} create-apparmor.vim.py > apparmor.vim
|
||||
|
||||
manpages: $(MANPAGES)
|
||||
|
||||
htmlmanpages: $(HTMLMANPAGES)
|
||||
|
||||
install: apparmor.vim manpages
|
||||
install -d $(VIM_INSTALL_PATH)
|
||||
install -m 644 $< $(VIM_INSTALL_PATH)
|
||||
|
@ -29,5 +31,5 @@ check: check_pod_files
|
|||
#Testing with all pythons
|
||||
$(call pyalldo, create-apparmor.vim.py > /dev/null)
|
||||
|
||||
clean:
|
||||
rm -f apparmor.vim common $(MANPAGES)
|
||||
clean: _clean
|
||||
rm -f apparmor.vim common
|
||||
|
|
Loading…
Add table
Reference in a new issue