[apparmor] [patch] utils: make html version of apparmor.vim manpage

Christian Boltz apparmor at cboltz.de
Thu Oct 16 21:51:47 UTC 2014


Hello,

Am Dienstag, 14. Oktober 2014 schrieb Steve Beattie:
> 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), and fixes a bug
> where the _clean target would report an error when used in a
> directory where the Makefile doesn't set the NAME variable.
> 
> (For whatever reason, none of the upstream install targets install the
> html manpages anywhere, so downstreams that want to include them need
> to install them manually. :/ I seem to recall this being because some
> downstreams didn't want the html versions by default.)

I'm using the %doc rpm macro, which means I don't need or want that 
"make install" installs them ;-)

> Signed-off-by: Steve Beattie <steve at nxnw.org>
> ---
>  common/Make.rules  |    2 +-
>  utils/vim/Makefile |    8 +++++---
>  2 files changed, 6 insertions(+), 4 deletions(-)
> 
> Index: b/utils/vim/Makefile
> ===================================================================
> --- a/utils/vim/Makefile
> +++ b/utils/vim/Makefile

Works :-)  - thanks!

> Index: b/common/Make.rules
> ===================================================================
> --- 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

This is unrelated to creating the HTML version of the apparmor.vim 
manpage, but a good idea nevertheless.

Please mention the common/Make.rules change in the commit message (or 
make it a separate commit).

That said,
Acked-by: Christian Boltz <apparmor at cboltz.de>


Regards,

Christian Boltz
-- 
Gegen nachhaltige Zweifel, ob die SSL-Verschlüsselung in Windows
wirklich noch den erwarteten Schutz vor unerwünschten Lauschern bieten
kann, hilft damit letztlich nur der Wechsel des Betriebssystems.
[http://www.heise.de/ct/artikel/Microsofts-Hintertuer-1921730.html]




More information about the AppArmor mailing list