buildsys: rework doc-gen cleanup and makefile inclusion

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

diff --git a/bin/Makefile b/bin/Makefile
index 9c6d4dfd20340e5071d34a753db9b1d9d9650eb7..248d1b8b9b2de5b14697fb7591e08c78032e67a1 100644 (file)
--- a/bin/Makefile
+++ b/bin/Makefile
@@ -1,10 +1,7 @@
 include ../defines.mk
 
-# this requires package pve-doc-generator
-export NOVIEW=1
-
 PERL_DOC_INC_DIRS=..
-include /usr/share/pve-doc-generator/pve-doc-generator.mk
+-include /usr/share/pve-doc-generator/pve-doc-generator.mk
 
 SERVICES = pvestatd pveproxy pvedaemon spiceproxy pvescheduler
 CLITOOLS = vzdump pvesubscription pveceph pveam pvesr pvenode pvesh pve6to7
@@ -76,8 +73,7 @@ install: $(SCRIPTS) $(CLI_MANS) $(SERVICE_MANS) $(BASH_COMPLETIONS) $(ZSH_COMPLE
 
 .PHONY: clean
 clean:
-       make cleanup-docgen
-       rm -rf *~ *.tmp $(CLI_MANS) $(SERVICE_MANS) *.1.pod *.8.pod                 \
-           *.bash-completion *.service-bash-completion                             \
-           *.zsh-completion *.service-zsh-completion                               \
-           *.api-verified *.service-api-verified
+       rm -f *.xml.tmp *.1 *.5 *.8 *{synopsis,opts}.adoc docinfo.xml
+       rm -f *~ *.tmp $(CLI_MANS) $(SERVICE_MANS) *.1.pod *.8.pod
+       rm -f *.bash-completion *.service-bash-completion *.zsh-completion *.service-zsh-completion
+       rm -f *.api-verified *.service-api-verified