From 39b9985afb9cda2ff2d56b48d6b62aed8e50c33f Mon Sep 17 00:00:00 2001 From: Steve Beattie Date: Thu, 16 Oct 2014 15:50:13 -0700 Subject: [PATCH] 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 Acked-by: Christian Boltz --- common/Make.rules | 2 +- utils/vim/Makefile | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/common/Make.rules b/common/Make.rules index 05fa3f72..3e46eb49 100644 --- a/common/Make.rules +++ b/common/Make.rules @@ -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 # ===================== diff --git a/utils/vim/Makefile b/utils/vim/Makefile index b0a616c3..ad7b9482 100644 --- a/utils/vim/Makefile +++ b/utils/vim/Makefile @@ -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 -- 2.22.0