bump version to 4.2-7

[pve-docs.git] / Makefile

diff --git a/Makefile b/Makefile
index f876cd956cdcaa506cc5bad2938465e89e2074a6..d049179c0d9718eb35cb4e26cdaf1194d6a5ee90 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -6,14 +6,12 @@ GEN_PACKAGE=pve-doc-generator
 DOC_PACKAGE=pve-docs
 
 # also update debian/changelog
-GEN_PKGREL=1
-# also update doc-debian/changelog
-DOC_PKGREL=2
+PKGREL=7
 
 GITVERSION:=$(shell cat .git/refs/heads/master)
 
-GEN_DEB=${GEN_PACKAGE}_${DOCRELEASE}-${GEN_PKGREL}_amd64.deb
-DOC_DEB=${DOC_PACKAGE}_${DOCRELEASE}-${DOC_PKGREL}_all.deb
+GEN_DEB=${GEN_PACKAGE}_${DOCRELEASE}-${PKGREL}_amd64.deb
+DOC_DEB=${DOC_PACKAGE}_${DOCRELEASE}-${PKGREL}_all.deb
 
 CHAPTER_LIST=          \
        sysadmin        \
@@ -87,6 +85,7 @@ GEN_SCRIPTS=                                  \
        gen-datacenter.cfg.5-opts.pl            \
        gen-pct.conf.5-opts.pl                  \
        gen-pct-network-opts.pl                 \
+       gen-pct-mountpoint-opts.pl              \
        gen-qm.conf.5-opts.pl                   \
        gen-vzdump.conf.5-opts.pl               \
        gen-pve-firewall-cluster-opts.pl        \
@@ -228,33 +227,28 @@ deb:
        make ${GEN_DEB};
        make ${DOC_DEB};
 
-${DOC_DEB}: index.html ${INDEX_INCLUDES} ${WIKI_IMPORTS} ${API_VIEWER_SOURCES}
+${GEN_DEB} ${DOC_DEB}: index.html ${INDEX_INCLUDES} ${WIKI_IMPORTS} ${API_VIEWER_SOURCES} ${GEN_DEB_SOURCES}
        rm -rf build
        mkdir build
-       rsync -a doc-debian/ build/debian
+       rsync -a debian/ build/debian
+       echo "git clone git://git.proxmox.com/git/pve-docs.git\\ngit checkout ${GITVERSION}" > build/debian/SOURCE
+       # install files for pve-doc-generator package
+       mkdir -p build/usr/share/${GEN_PACKAGE}
+       mkdir -p build/usr/share/doc/${GEN_PACKAGE}
+       install -m 0644 ${GEN_DEB_SOURCES} build/usr/share/${GEN_PACKAGE}
+       install -m 0755 ${GEN_SCRIPTS} build/usr/share/${GEN_PACKAGE}
+       # install files for pvedocs package
        mkdir -p build/usr/share/${DOC_PACKAGE}
        mkdir -p build/usr/share/doc/${DOC_PACKAGE}
-       echo "git clone git://git.proxmox.com/git/pve-docs.git\\ngit checkout ${GITVERSION}" > build/usr/share/doc/${DOC_PACKAGE}/SOURCE
-       # install doc files
        install -m 0644 index.html ${INDEX_INCLUDES} build/usr/share/${DOC_PACKAGE}
        install -m 0644 ${WIKI_IMPORTS} build/usr/share/${DOC_PACKAGE}
        # install api doc viewer
        mkdir build/usr/share/${DOC_PACKAGE}/api-viewer
        install -m 0644 ${API_VIEWER_SOURCES} build/usr/share/${DOC_PACKAGE}/api-viewer
-       cd build; dpkg-buildpackage -rfakeroot -b -us -uc
-       lintian ${DOC_DEB}
-
-${GEN_DEB}: ${GEN_DEB_SOURCES}
-       rm -rf build
-       mkdir build
-       rsync -a debian/ build/debian
-       mkdir -p build/usr/share/${GEN_PACKAGE}
-       mkdir -p build/usr/share/doc/${GEN_PACKAGE}
-       echo "git clone git://git.proxmox.com/git/pve-docs.git\\ngit checkout ${GITVERSION}" > build/usr/share/doc/${GEN_PACKAGE}/SOURCE
-       install -m 0644 ${GEN_DEB_SOURCES} build/usr/share/${GEN_PACKAGE}
-       install -m 0755 ${GEN_SCRIPTS} build/usr/share/${GEN_PACKAGE}
+       # build debain package
        cd build; dpkg-buildpackage -rfakeroot -b -us -uc
        lintian ${GEN_DEB}
+       lintian ${DOC_DEB}
 
 .PHONY: upload
 upload: ${GEN_DEB} ${DOC_DEB}
@@ -271,9 +265,9 @@ upload: ${GEN_DEB} ${DOC_DEB}
 update: clean
        rm -f *.5-opts.adoc *.1-synopsis.adoc *.8-synopsis.adoc
        rm -f api-viewer/apidata.js
-       rm -f pve-firewall-macros.adoc pct-network-opts.adoc
+       rm -f pve-firewall-macros.adoc pct-network-opts.adoc pct-mountpoint-opts.adoc
        make all
 
-clean:
-       rm -rf *.html *.pdf *.epub *.tmp *.1 *.5 *.8 *.deb *.changes build api-viewer/apidoc.js chapter-*.html chapter-*-plain.html chapter-*.html pve-admin-guide.chunked
+clean: 
+       rm -rf *.tmp.xml *.html *.pdf *.epub *.tmp *.1 *.5 *.8 *.deb *.changes build api-viewer/apidoc.js chapter-*.html chapter-*-plain.html chapter-*.html pve-admin-guide.chunked
        find . -name '*~' -exec rm {} ';'