do not ignore hotplug parse errors

[qemu-server.git] / Makefile

diff --git a/Makefile b/Makefile
index 5ea8b9c1f0da59774aa2f68eebd032ec143f2bd5..a383717109c8a6aea1fec3c72f487923c5433336 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,8 @@
-RELEASE=4.1
+RELEASE=4.2
 
 VERSION=4.0
 PACKAGE=qemu-server
-PKGREL=64
+PKGREL=76
 
 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,45 +48,23 @@ 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: PVE/CLI/qm.pm 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: PVE/CLI/qmrestore.pm
-       perl -I. -T -e "use PVE::CLI::qmrestore; PVE::CLI::qmrestore->generate_pod_manpage();" >$@.tmp
-       mv $@.tmp $@
-
 qmrestore.bash-completion:
        perl -I. -T -e "use PVE::CLI::qmrestore; PVE::CLI::qmrestore->generate_bash_completions();" >$@.tmp
        mv $@.tmp $@
 
-vm.conf.5.pod: gen-vmconf-pod.pl PVE/QemuServer.pm 
-       perl -I. ./gen-vmconf-pod.pl >$@
-
-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 qmrestore.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}${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}
@@ -99,12 +81,13 @@ install: ${PKGSOURCES}
        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}
@@ -136,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 *.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 {} ';'