X-Git-Url: https://git.proxmox.com/?p=pve-access-control.git;a=blobdiff_plain;f=Makefile;h=7d67c027c02777be10b04f99385b47186dedd638;hp=f8e0002acaced53cbffba2bc7d2b6ae4b586139b;hb=730f8863ebc3dc0b40215c64c91d7031eec64b8c;hpb=cca9761a2093a9be9630e4a94d6b83edd7684567

diff --git a/Makefile b/Makefile
index f8e0002..7d67c02 100644
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,6 @@
-RELEASE=4.1
-
 VERSION=4.0
 PACKAGE=libpve-access-control
-PKGREL=14
+PKGREL=23
 
 DESTDIR=
 PREFIX=/usr
@@ -10,7 +8,6 @@ BINDIR=${PREFIX}/bin
 SBINDIR=${PREFIX}/sbin
 MANDIR=${PREFIX}/share/man
 DOCDIR=${PREFIX}/share/doc/${PACKAGE}
-PODDIR=${DOCDIR}/pod
 MAN1DIR=${MANDIR}/man1/
 BASHCOMPLDIR=${PREFIX}/share/bash-completion/completions/
 
@@ -21,27 +18,22 @@ GITVERSION:=$(shell cat .git/refs/heads/master)
 
 DEB=${PACKAGE}_${VERSION}-${PKGREL}_${ARCH}.deb
 
+# this requires package pve-doc-generator
+export NOVIEW=1
+include /usr/share/pve-doc-generator/pve-doc-generator.mk
+
 all: ${DEB}
 
 .PHONY: dinstall
 dinstall: deb
 	dpkg -i ${DEB}
 
-%.1.gz: %.1.pod
-	rm -f $@
-	cat $<|pod2man -n $* -s 1 -r ${VERSION} -c "Proxmox Documentation"|gzip -c9 >$@.tmp
-	mv $@.tmp $@
-
-pveum.1.pod: PVE/CLI/pveum.pm
-	perl -I. -T -e "use PVE::CLI::pveum; PVE::CLI::pveum->generate_pod_manpage();" >$@.tmp
-	mv $@.tmp $@
-
 pveum.bash-completion: PVE/CLI/pveum.pm
 	perl -I. -T -e "use PVE::CLI::pveum; PVE::CLI::pveum->generate_bash_completions();" >$@.tmp
 	mv $@.tmp $@
 
 .PHONY: install
-install: pveum.1.pod pveum.1.gz oathkeygen pveum.bash-completion
+install: pveum.1 oathkeygen pveum.bash-completion
 	install -d ${DESTDIR}${BINDIR}
 	install -d ${DESTDIR}${SBINDIR}
 	install -m 0755 pveum ${DESTDIR}${SBINDIR}
@@ -49,10 +41,10 @@ install: pveum.1.pod pveum.1.gz oathkeygen pveum.bash-completion
 	make -C PVE install
 	perl -I. ./pveum verifyapi
 	perl -I. -T -e "use PVE::CLI::pveum; PVE::CLI::pveum->verify_api();"
-	install -d ${DESTDIR}/usr/share/man/man1
-	install -d ${DESTDIR}${PODDIR}
-	install -m 0644 pveum.1.gz ${DESTDIR}/usr/share/man/man1/
-	install -m 0644 pveum.1.pod ${DESTDIR}/${PODDIR}
+	install -d ${DESTDIR}/${MAN1DIR}
+	install -d ${DESTDIR}/${DOCDIR}
+	install -m 0644 pveum.1 ${DESTDIR}/${MAN1DIR}
+	gzip -9 ${DESTDIR}/${MAN1DIR}/pveum.1
 	install -m 0644 -D pveum.bash-completion ${DESTDIR}${BASHCOMPLDIR}/pveum
 
 .PHONY: deb ${DEB}
@@ -74,17 +66,12 @@ deb ${DEB}:
 
 .PHONY: upload
 upload: ${DEB}
-	umount /pve/${RELEASE}; mount /pve/${RELEASE} -o rw 
-	mkdir -p /pve/${RELEASE}/extra
-	rm -f /pve/${RELEASE}/extra/${PACKAGE}_*.deb
-	rm -f /pve/${RELEASE}/extra/Packages*
-	cp ${DEB} /pve/${RELEASE}/extra
-	cd /pve/${RELEASE}/extra; dpkg-scanpackages . /dev/null > Packages; gzip -9c Packages > Packages.gz
-	umount /pve/${RELEASE}; mount /pve/${RELEASE} -o ro
+	tar cf - ${DEB} | ssh repoman@repo.proxmox.com upload
 
 .PHONY: clean
-clean: 	
-	rm -rf build *~ *.deb ${PACKAGE}-*.tar.gz pveum.1.pod pveum.1.gz
+clean:
+	make cleanup-docgen
+	rm -rf build *~ *.deb ${PACKAGE}-*.tar.gz pveum.1
 	find . -name '*~' -exec rm {} ';'
 
 .PHONY: distclean