totp: fix copy/paste mistake

[pve-docs.git] / Makefile

diff --git a/Makefile b/Makefile
index cfc4661f6bcec7f5d19c22104d0251acab67019d..801a2a365c71b89967ece923d856fe933720da4a 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -4,17 +4,18 @@ include /usr/share/dpkg/pkg-info.mk
 DGDIR=.
 ASCIIDOC_PVE=./asciidoc-pve
 
+BUILDDIR ?= $(DEB_SOURCE)-$(DEB_VERSION)
+DSC=$(DEB_SOURCE)_$(DEB_VERSION).dsc
+
 GEN_PACKAGE=pve-doc-generator
 DOC_PACKAGE=pve-docs
 MEDIAWIKI_PACKAGE=pve-docs-mediawiki
 
 GITVERSION:=$(shell git rev-parse HEAD)
 
-ARCH:=$(shell dpkg-architecture -qDEB_BUILD_ARCH)
-
-GEN_DEB=$(GEN_PACKAGE)_$(DEB_VERSION_UPSTREAM_REVISION)_$(ARCH).deb
-DOC_DEB=$(DOC_PACKAGE)_$(DEB_VERSION_UPSTREAM_REVISION)_all.deb
-MEDIAWIKI_DEB=$(MEDIAWIKI_PACKAGE)_$(DEB_VERSION_UPSTREAM_REVISION)_all.deb
+GEN_DEB=$(GEN_PACKAGE)_$(DEB_VERSION)_all.deb
+DOC_DEB=$(DOC_PACKAGE)_$(DEB_VERSION)_all.deb
+MEDIAWIKI_DEB=$(MEDIAWIKI_PACKAGE)_$(DEB_VERSION)_all.deb
 
 export SOURCE_DATE_EPOCH ?= $(shell dpkg-parsechangelog -STimestamp)
 SOURCE_DATE_HUMAN := $(shell date -d "@$(SOURCE_DATE_EPOCH)")
@@ -94,15 +95,9 @@ INDEX_INCLUDES=                                                              \
 
 ADOC_STDARG=-b $(shell pwd)/asciidoc/pve-html -f asciidoc/asciidoc-pve.conf -a icons -a data-uri -a "date=$(SOURCE_DATE_HUMAN)" -a "revnumber=$(DOCRELEASE)" -a footer-style=revdate
 
-BROWSER?=xdg-open
-
 README.html: README.adoc
        asciidoc -a toc $(ADOC_STDARG) -o $@ $<
 
-.PHONY: index
-index: index.html
-       test -z "$${PVE_DOC_INSTANTVIEW}" || $(BROWSER) index.html &
-
 chapter-index-table.adoc: asciidoc-pve
        ./asciidoc-pve chapter-table >$@.tmp
        mv $@.tmp $@
@@ -158,21 +153,35 @@ api-viewer/apidoc.js: $(API_VIEWER_FILES)
        cat $(API_VIEWER_FILES) >$@.tmp
        mv $@.tmp $@
 
-.PHONY: dinstall
-dinstall: $(GEN_DEB) $(DOC_DEB) $(MEDIAWIKI_DEB)
-       dpkg -i $(GEN_DEB) $(DOC_DEB) # $(MEDIAWIKI_DEB)
+$(BUILDDIR):
+       rm -rf $@ $@.tmp
+       rsync -a * $@.tmp/
+       echo "git clone git://git.proxmox.com/git/pve-docs.git\\ngit checkout $(GITVERSION)" > $@.tmp/debian/SOURCE
+       mv $@.tmp $@
 
-.PHONY: deb
-deb: $(DOC_DEB)
-$(MEDIAWIKI_DEB) $(GEN_DEB): $(DOC_DEB)
-$(DOC_DEB):
+.PHONY: dsc deb
+dsc: $(DSC)
+$(DSC): $(BUILDDIR)
+       cd $(BUILDDIR); dpkg-buildpackage -S -us -uc -d
+       lintian $(DSC)
+
+sbuild: $(DSC)
+       sbuild $(DSC)
+
+deb:
        rm -f $(GEN_DEB) $(DOC_DEB) $(MEDIAWIKI_DEB)
-       rm -rf build
-       rsync -a * build/
-       echo "git clone git://git.proxmox.com/git/pve-docs.git\\ngit checkout $(GITVERSION)" > build/debian/SOURCE
-       cd build; dpkg-buildpackage -b -us -uc
+       rm -rf $(BUILDDIR)
+       $(MAKE) $(DOC_DEB)
+
+$(MEDIAWIKI_DEB) $(GEN_DEB): $(DOC_DEB)
+$(DOC_DEB): $(BUILDDIR)
+       cd $(BUILDDIR); dpkg-buildpackage -b -us -uc
        lintian $(DOC_DEB) $(GEN_DEB) $(MEDIAWIKI_DEB)
 
+.PHONY: dinstall
+dinstall: $(GEN_DEB) $(DOC_DEB) $(MEDIAWIKI_DEB)
+       dpkg -i $(GEN_DEB) $(DOC_DEB) # $(MEDIAWIKI_DEB)
+
 .PHONY: clean-build
 clean-build:
        rm -rf build
@@ -192,6 +201,7 @@ gen-install: $(GEN_DEB_SOURCES) asciidoc-pve asciidoc/mediawiki.conf
        install -m 0755 asciidoc-pve $(DESTDIR)/usr/bin/
        install -D -m 0644 asciidoc/mediawiki.conf $(DESTDIR)/usr/share/$(GEN_PACKAGE)/asciidoc/mediawiki.conf
        install -m 0644 asciidoc/asciidoc-pve.conf $(DESTDIR)/usr/share/$(GEN_PACKAGE)/asciidoc/
+       install -m 0644 asciidoc/pve-docbook.conf $(DESTDIR)/usr/share/$(GEN_PACKAGE)/asciidoc/
        install -m 0644 asciidoc/pve-html.conf $(DESTDIR)/usr/share/$(GEN_PACKAGE)/asciidoc/
 
 .PHONY: doc-install
@@ -224,8 +234,9 @@ mediawiki-install: pve-docs-mediawiki-import
        install -m 0755 pve-docs-mediawiki-import $(DESTDIR)/usr/bin/
 
 .PHONY: upload
+upload: UPLOAD_DIST ?= $(DEB_DISTRIBUTION)
 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 bullseye
+       tar cf - $(GEN_DEB) $(DOC_DEB) $(MEDIAWIKI_DEB) | ssh -X repoman@repo.proxmox.com -- upload --product pve --dist $(UPLOAD_DIST)
 
 .PHONY: update
 update:
@@ -246,8 +257,8 @@ clean-static:
 
 clean:
        rm -rf *.html *.pdf *.epub *.tmp *.1 *.5 *.8
-       rm -f *.deb *.changes *.buildinfo
+       rm -f *.deb *.dsc *.tar.* *.changes *.buildinfo *.build
        rm -f api-viewer/apidoc.js chapter-*.html *-plain.html chapter-*.html pve-admin-guide.chunked asciidoc-pve link-refs.json .asciidoc-pve-tmp_* pve-docs-mediawiki-import
        rm -rf .pve-doc-depends
        rm -f pve-doc-generator.mk chapter-index-table.adoc man1-index-table.adoc man5-index-table.adoc man8-index-table.adoc pve-admin-guide-docinfo.xml
-       rm -rf build
+       rm -rf $(DEB_SOURCE)-[0-9]*/