create correct man page and .pod

diff --git a/.gitignore b/.gitignore
index 9775d5c897b7dec472f695cb9296189de4af11c0..e1fc9d6787e585dbe611719d96b89111dab5c38a 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,4 @@
 build
 *.deb
+*.1.pod
+*.1.gz

diff --git a/Makefile b/Makefile
index 71c1306cc1cffec7abdd30df98d9168ad879b5bd..7d85a43d105233b62ac994ca75314da78224d174 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -9,7 +9,8 @@ PREFIX=/usr
 BINDIR=${PREFIX}/bin
 SBINDIR=${PREFIX}/sbin
 MANDIR=${PREFIX}/share/man
-DOCDIR=${PREFIX}/share/doc
+DOCDIR=${PREFIX}/share/doc/${PACKAGE}
+PODDIR=${DOCDIR}/pod
 MAN1DIR=${MANDIR}/man1/
 export PERLDIR=${PREFIX}/share/perl5
 
@@ -22,15 +23,24 @@ all: ${DEB}
 dinstall: deb
        dpkg -i ${DEB}
 
+%.1.gz: %.1.pod
+       rm -f $@
+       cat $<|pod2man -n $* -s 1 -r ${VERSION} -c "Proxmox Documentation"|gzip -c9 >$@
+
+pveum.1.pod: pveum
+       perl -I. ./pveum printmanpod >$@
+
 .PHONY: install
-install:
+install: pveum.1.pod pveum.1.gz
        install -d ${DESTDIR}${BINDIR}
        install -d ${DESTDIR}${SBINDIR}
        install -m 0755 pveum ${DESTDIR}${SBINDIR}
        make -C PVE install
        perl -I. ./pveum verifyapi 
        install -d ${DESTDIR}/usr/share/man/man1
-       pod2man -n pveum -s 1 -r "proxmox 2.0" -c "Proxmox Documentation" <pveum | gzip -9 > ${DESTDIR}/usr/share/man/man1/pveum.1.gz
+       install -d ${DESTDIR}${PODDIR}
+       install -m 0644 pveum.1.gz ${DESTDIR}/usr/share/man/man1/
+       install -m 0644 pveum.1.pod ${DESTDIR}/${PODDIR}
 
 .PHONY: deb ${DEB}
 deb ${DEB}:
@@ -39,9 +49,9 @@ deb ${DEB}:
        make DESTDIR=`pwd`/build install
        install -d -m 0755 build/DEBIAN
        sed -e s/@@VERSION@@/${VERSION}/ -e s/@@PKGRELEASE@@/${PKGREL}/ -e s/@@ARCH@@/${ARCH}/ <control.in >build/DEBIAN/control
-       install -D -m 0644 copyright build/${DOCDIR}/${PACKAGE}/copyright
-       install -m 0644 changelog.Debian build/${DOCDIR}/${PACKAGE}/
-       gzip -9 build/${DOCDIR}/${PACKAGE}/changelog.Debian
+       install -D -m 0644 copyright build/${DOCDIR}/copyright
+       install -m 0644 changelog.Debian build/${DOCDIR}/
+       gzip -9 build/${DOCDIR}/changelog.Debian
        dpkg-deb --build build  
        mv build.deb ${DEB}
        #rm -rf build

diff --git a/pveum b/pveum
index 1a2f532ac0a7c57e564cff6e52bd3dde90ee91f6..2c468d05cc68f1aa31630739bfbc9dd065aa7761 100755 (executable)
--- a/pveum
+++ b/pveum
@@ -78,12 +78,7 @@ my $cmddef = {
 
 my $cmd = shift;
 
-if ($cmd && $cmd eq 'verifyapi') {
-    PVE::RESTHandler::validate_method_schemas();
-    exit 0;
-}
-
-PVE::CLIHandler::handle_cmd($cmddef, "pveum", $cmd, \@ARGV, $read_password);
+PVE::CLIHandler::handle_cmd($cmddef, "pveum", $cmd, \@ARGV, $read_password, $0);
 
 exit 0;
 
@@ -95,8 +90,10 @@ pveum - PVE User Manager
 
 =head1 SYNOPSIS
 
-    pveum <COMMAND> [OPTIONS]
+=include synopsis
 
 =head1 DESCRIPTION
 
-no description available
+No description available.
+
+=include pve_copyright