remove nwdiag related things

[pve-docs.git] / Makefile

diff --git a/Makefile b/Makefile
index 3bb308c7320885de3cd5579c9bae72bc9d97a498..781acb28b30e28ac921821d8d036ea7cec4c5ef1 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -6,7 +6,7 @@ DOC_PACKAGE=pve-docs
 MEDIAWIKI_PACKAGE=pve-docs-mediawiki
 
 # also update debian/changelog
-PKGREL=18
+PKGREL=8
 
 GITVERSION:=$(shell git rev-parse HEAD)
 
@@ -58,7 +58,8 @@ GEN_SCRIPTS=                                  \
        gen-pve-firewall-host-opts.pl           \
        gen-pve-firewall-macros-adoc.pl         \
        gen-pve-firewall-rules-opts.pl          \
-       gen-pve-firewall-vm-opts.pl
+       gen-pve-firewall-vm-opts.pl             \
+       gen-output-format-opts.pl
 
 API_VIEWER_SOURCES=                            \
        api-viewer/index.html                   \
@@ -88,10 +89,6 @@ ADOC_STDARG=-b $(shell pwd)/asciidoc/pve-html -f asciidoc/asciidoc-pve.conf -a i
 
 BROWSER?=xdg-open
 
-
-%-nwdiag.svg: %.nwdiag
-       nwdiag -T svg $*.nwdiag -o $@;
-
 README.html: README.adoc
        asciidoc -a toc ${ADOC_STDARG} -o $@ $<
 
@@ -201,6 +198,8 @@ $(DOC_DEB): index.html $(WIKI_IMPORTS) $(API_VIEWER_SOURCES) verify-images
        install -dm755 build-$(DOC_PACKAGE)/usr/share/doc/${DOC_PACKAGE}
        install -m 0644 index.html ${INDEX_INCLUDES} build-$(DOC_PACKAGE)/usr/share/${DOC_PACKAGE}
        install -m 0644 ${WIKI_IMPORTS} build-$(DOC_PACKAGE)/usr/share/${DOC_PACKAGE}
+       # install images
+       make -C images DESTDIR=../build-$(DOC_PACKAGE) install
        # install screenshot images
        install -dm755 build-$(DOC_PACKAGE)/usr/share/${DOC_PACKAGE}/images/screenshot
        install -m 0644 images/screenshot/*.png build-$(DOC_PACKAGE)/usr/share/${DOC_PACKAGE}/images/screenshot
@@ -223,11 +222,15 @@ upload: ${GEN_DEB} ${DOC_DEB} ${MEDIAWIKI_DEB}
        tar cf - ${GEN_DEB} ${DOC_DEB} ${MEDIAWIKI_DEB} | ssh -X repoman@repo.proxmox.com -- upload --product pve --dist stretch
 
 .PHONY: update
-update: clean clean-static | update-static
+update:
+       make clean clean-static
+       make update-static
        make all
 
 .PHONY: update-static
-update-static: clean-static | $(filter %-synopsis.adoc %-opts.adoc, ${PVE_ADMIN_GUIDE_ADOCDEPENDS}) pve-firewall-macros.adoc api-viewer/apidata.js
+update-static:
+       make clean-static
+       make $(filter %-synopsis.adoc %-opts.adoc, ${PVE_ADMIN_GUIDE_ADOCDEPENDS}) pve-firewall-macros.adoc api-viewer/apidata.js
 
 .PHONY: clean-static
 clean-static: