From 08c9d4ebefc6e752956e5649278fd3adc3f11087 Mon Sep 17 00:00:00 2001 From: Thomas Lamprecht Date: Mon, 29 May 2023 14:56:23 +0200 Subject: [PATCH] buildsys: rework doc-gen cleanup and makefile inclusion Signed-off-by: Thomas Lamprecht --- bin/Makefile | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/bin/Makefile b/bin/Makefile index 9c6d4dfd..248d1b8b 100644 --- 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