X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=Makefile;h=1ab3f300e1d2403ad9180a6822ae31732eeca73d;hb=4eb686043552f755c9d66e529b49614fa20f315e;hp=9c47a196584ede7e4c3838a837cd0df7f0fa3b82;hpb=0e14d632bdc5e0944e380c5291a66e4e1d8713ab;p=qemu-server.git

diff --git a/Makefile b/Makefile
index 9c47a19..1ab3f30 100644
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,8 @@
-RELEASE=4.0
+RELEASE=4.2
 
 VERSION=4.0
 PACKAGE=qemu-server
-PKGREL=29
+PKGREL=82
 
 CFLAGS= -O2 -Werror -Wall -Wtype-limits -Wl,-z,relro 
 
@@ -15,8 +15,8 @@ LIBDIR=${PREFIX}/lib/${PACKAGE}
 VARLIBDIR=/var/lib/${PACKAGE}
 MANDIR=${PREFIX}/share/man
 DOCDIR=${PREFIX}/share/doc
-PODDIR=${PREFIX}/share/doc/${PACKAGE}/pod
 MAN1DIR=${MANDIR}/man1/
+MAN5DIR=${MANDIR}/man5/
 BASHCOMPLDIR=${PREFIX}/share/bash-completion/completions/
 export PERLDIR=${PREFIX}/share/perl5
 PERLINCDIR=${PERLDIR}/asm-x86_64
@@ -26,6 +26,10 @@ 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
@@ -44,61 +48,46 @@ vmtar: vmtar.c utils.c
 sparsecp: sparsecp.c utils.c
 	gcc ${CFLAGS} -o sparsecp sparsecp.c
 
-%.1.gz: %.1.pod
-	rm -f $@
-	cat $<|pod2man -n $* -s 1 -r ${VERSION} -c "Proxmox Documentation"|gzip -c9 >$@
-
-%.5.gz: %.5.pod
-	rm -f $@
-	cat $<|pod2man -n $* -s 5 -r ${VERSION} -c "Proxmox Documentation"|gzip -c9 >$@
-
-%.1.pod: %
-	podselect $*>$@
-
-qm.1.pod: qm PVE/QemuServer.pm
-	perl -I. -T -e "use PVE::CLI::qm; PVE::CLI::qm->generate_pod_manpage();" >$@.tmp
-	mv $@.tmp $@
-
 qm.bash-completion:
 	perl -I. -T -e "use PVE::CLI::qm; PVE::CLI::qm->generate_bash_completions();" >$@.tmp
 	mv $@.tmp $@
 
-qmrestore.1.pod: qmrestore
-	perl -I. ./qmrestore printmanpod >$@
-
-vm.conf.5.pod: gen-vmconf-pod.pl PVE/QemuServer.pm 
-	perl -I. ./gen-vmconf-pod.pl >$@
+qmrestore.bash-completion:
+	perl -I. -T -e "use PVE::CLI::qmrestore; PVE::CLI::qmrestore->generate_bash_completions();" >$@.tmp
+	mv $@.tmp $@
 
-PKGSOURCES=qm qm.1.gz qm.1.pod qmrestore qmrestore.1.pod qmrestore.1.gz qmextract sparsecp vmtar control vm.conf.5.pod vm.conf.5.gz qm.bash-completion
+PKGSOURCES=qm qm.1 qmrestore qmrestore.1 qmextract sparsecp vmtar control qm.conf.5 qm.bash-completion qmrestore.bash-completion
 
 .PHONY: install
 install: ${PKGSOURCES}
 	install -d ${DESTDIR}/${SBINDIR}
-	install -d ${DESTDIR}/etc/${PACKAGE}
 	install -d ${DESTDIR}${LIBDIR}
 	install -d ${DESTDIR}${VARLIBDIR}
-	install -d ${DESTDIR}${PODDIR}
-	install -d ${DESTDIR}/usr/share/man/man1
+	install -d ${DESTDIR}/${MAN1DIR}
+	install -d ${DESTDIR}/${MAN5DIR}
 	install -d ${DESTDIR}/usr/share/man/man5
 	install -d ${DESTDIR}/usr/share/${PACKAGE}
 	install -m 0644 pve-usb.cfg ${DESTDIR}/usr/share/${PACKAGE}
 	install -m 0644 pve-q35.cfg ${DESTDIR}/usr/share/${PACKAGE}
 	install -m 0644 -D qm.bash-completion ${DESTDIR}/${BASHCOMPLDIR}/qm
+	install -m 0644 -D qmrestore.bash-completion ${DESTDIR}/${BASHCOMPLDIR}/qmrestore
 	make -C PVE install
 	install -m 0755 qm ${DESTDIR}${SBINDIR}
 	install -m 0755 qmrestore ${DESTDIR}${SBINDIR}
 	install -m 0755 pve-bridge ${DESTDIR}${VARLIBDIR}/pve-bridge
+	install -m 0755 pve-bridge-hotplug ${DESTDIR}${VARLIBDIR}/pve-bridge-hotplug
 	install -m 0755 pve-bridgedown ${DESTDIR}${VARLIBDIR}/pve-bridgedown
 	install -s -m 0755 vmtar ${DESTDIR}${LIBDIR}
 	install -s -m 0755 sparsecp ${DESTDIR}${LIBDIR}
 	install -D -m 0644 modules-load.conf ${DESTDIR}/etc/modules-load.d/qemu-server.conf
 	install -m 0755 qmextract ${DESTDIR}${LIBDIR}
-	install -m 0644 qm.1.gz ${DESTDIR}/usr/share/man/man1/
-	install -m 0644 qm.1.pod ${DESTDIR}/${PODDIR}
-	install -m 0644 qmrestore.1.gz ${DESTDIR}/usr/share/man/man1/
-	install -m 0644 qmrestore.1.pod ${DESTDIR}/${PODDIR}
-	install -m 0644 vm.conf.5.pod ${DESTDIR}/${PODDIR}
-	install -m 0644 vm.conf.5.gz ${DESTDIR}/usr/share/man/man5/
+	install -m 0644 qm.1 ${DESTDIR}/${MAN1DIR}
+	gzip -9 ${DESTDIR}/${MAN1DIR}/qm.1
+	install -m 0644 qmrestore.1 ${DESTDIR}/${MAN1DIR}
+	gzip -9 ${DESTDIR}/${MAN1DIR}/qmrestore.1
+	install -m 0644 qm.conf.5 ${DESTDIR}/${MAN5DIR}
+	gzip -9 ${DESTDIR}/${MAN5DIR}/qm.conf.5
+	cd ${DESTDIR}/${MAN5DIR}; ln -s qm.conf.5.gz vm.conf.5.gz
 
 .PHONY: deb ${DEB}
 deb ${DEB}: ${PKGSOURCES}
@@ -130,7 +119,8 @@ upload:
 
 .PHONY: clean
 clean: 	
-	rm -rf build *.deb control vzsyscalls.ph _h2ph_pre.ph ${PACKAGE}-*.tar.gz dist *.1.gz *.pod vmtar sparsecp *.tmp qm.bash-completion
+	make cleanup-docgen
+	rm -rf build *.deb control vzsyscalls.ph _h2ph_pre.ph ${PACKAGE}-*.tar.gz dist *.1 *.5 *.pod vmtar sparsecp *.tmp *.bash-completion
 	find . -name '*~' -exec rm {} ';'