buildsys: rework doc-gen cleanup and makefile inclusion

The NOVIEW variable is useless now anyway, and the cleanup-docgen
target is a bit dangerous (removes _all_ *.adoc files) and it's just
a single line, so avoid complexity.

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>

diff --git a/src/Makefile b/src/Makefile
index 0f877e894f9a3ce75ff0c7c9256b015c9a3880b0..7b654a165cda5c356004e0b0067b5ed8bbe32139 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -9,8 +9,7 @@ MAN8DIR=${MANDIR}/man8/
 BASHCOMPLDIR=${DESTDIR}/${PREFIX}/share/bash-completion/completions
 ZSHCOMPLDIR=${DESTDIR}/${PREFIX}/share/zsh/vendor-completions
 
-export NOVIEW=1
-include /usr/share/pve-doc-generator/pve-doc-generator.mk
+-include /usr/share/pve-doc-generator/pve-doc-generator.mk
 
 all: pve-firewall.8 pvefw-logger
 
@@ -45,9 +44,8 @@ install: pve-firewall pve-firewall.8 pve-firewall.bash-completion pve-firewall.z
 .PHONY: clean
 clean:         
        make -C PVE clean
-       make cleanup-docgen
-       rm -rf pvefw-logger 
-       find . -name '*~' -exec rm {} ';'
+       rm -f *.xml.tmp *.1 *.5 *.8 *(synopsis,opts).adoc docinfo.xml *~
+       rm -rf pvefw-logger
 
 
 .PHONY: distclean