bump version to 4.2-3

[pve-http-server.git] / Makefile

diff --git a/Makefile b/Makefile
index 46573b6f5d070c1ba6ab8bf26535713abda3a08c..c8abf08b91a5eea77aa2fe7253c6e522030468d2 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -7,87 +7,29 @@ BUILDDIR ?= ${PACKAGE}-${DEB_VERSION_UPSTREAM}
 
 DEB=${PACKAGE}_${DEB_VERSION_UPSTREAM_REVISION}_all.deb
 
-DESTDIR=
-
-PERL5DIR=${DESTDIR}/usr/share/perl5
-DOCDIR=${DESTDIR}/usr/share/doc/${PACKAGE}
-
-WWWBASEDIR=${DESTDIR}/usr/share/${PACKAGE}
-WWWCSSDIR=${WWWBASEDIR}/css
-WWWFONTSDIR=${WWWBASEDIR}/fonts
-WWWJSDIR=${WWWBASEDIR}/js
-
-# bootstrap library
-BTVER=3.4.1
-BTDIR=bootstrap-${BTVER}-dist
-BTSRC=${BTDIR}.zip
-
-BTDATA =                                                       \
-       ${BTDIR}/css/bootstrap.min.css                          \
-       ${BTDIR}/css/bootstrap-theme.min.css                    \
-       ${BTDIR}/js/bootstrap.min.js                            \
-       ${BTDIR}/fonts/glyphicons-halflings-regular.ttf
-
-JQVER=3.4.1
-JQSRC=jquery-${JQVER}.min.js
-
 all:
 
 .PHONY: deb
 deb: ${DEB}
 ${DEB}:
        rm -rf ${BUILDDIR}
-       rsync -a * ${BUILDDIR}
+       cp -a src ${BUILDDIR}
+       cp -a debian ${BUILDDIR}/
        echo "git clone git://git.proxmox.com/git/pve-http-server\\ngit checkout $(GITVERSION)" > $(BUILDDIR)/debian/SOURCE
        cd ${BUILDDIR}; dpkg-buildpackage -b -us -uc
        lintian ${DEB}
 
-download_bootstrap:
-       rm -f ${BTSRC}$ ${BTSRC}.tmp
-       wget https://github.com/twbs/bootstrap/releases/download/v${BTVER}/${BTSRC} -O ${BTSRC}.tmp
-       mv ${BTSRC}.tmp ${BTSRC}
-
-download_jquery:
-       rm -f ${JQSRC} ${JQSRC}.tmp
-       wget https://code.jquery.com/jquery-${JQVER}.min.js -O ${JQSRC}.tmp
-       mv ${JQSRC}.tmp ${JQSRC}
-
-${BTDATA}: ${BTDIR}
-${BTDIR}: ${BTSRC}
-       rm -rf ${BTDIR}
-       unzip -x ${BTSRC}
-
-install: ${BTDATA}
-       install -d -m 755 ${PERL5DIR}/PVE/APIServer
-       install -m 0644 PVE/APIServer/AnyEvent.pm ${PERL5DIR}/PVE/APIServer
-       install -m 0644 PVE/APIServer/Formatter.pm ${PERL5DIR}/PVE/APIServer
-       install -m 0644 PVE/APIServer/Utils.pm ${PERL5DIR}/PVE/APIServer
-       install -d -m 755 ${PERL5DIR}/PVE/APIServer/Formatter
-       install -m 0644 PVE/APIServer/Formatter/Standard.pm ${PERL5DIR}/PVE/APIServer/Formatter
-       install -m 0644 PVE/APIServer/Formatter/Bootstrap.pm ${PERL5DIR}/PVE/APIServer/Formatter
-       install -m 0644 PVE/APIServer/Formatter/HTML.pm ${PERL5DIR}/PVE/APIServer/Formatter
-       # install bootstrap and jquery
-       install -d -m 755 ${WWWBASEDIR}
-       install -d -m 755 ${WWWCSSDIR}
-       install -m 0644 -o www-data -g www-data ${BTDIR}/css/bootstrap.min.css ${WWWCSSDIR}
-       install -m 0644 -o www-data -g www-data ${BTDIR}/css/bootstrap-theme.min.css ${WWWCSSDIR}
-       install -d -m 755 ${WWWJSDIR}
-       install -m 0644 -o www-data -g www-data ${BTDIR}/js/bootstrap.min.js ${WWWJSDIR}
-       install -m 0644 -o www-data -g www-data ${JQSRC} ${WWWJSDIR}
-       install -d -m 755 ${WWWFONTSDIR}
-       install -m 0644 ${BTDIR}/fonts/glyphicons-halflings-regular.ttf ${WWWFONTSDIR}
-
-
 .PHONY: upload
 upload: ${DEB}
-       tar cf - ${DEB} | ssh -X repoman@repo.proxmox.com -- upload --product pve,pmg --dist stretch
+       tar cf - ${DEB} | ssh -X repoman@repo.proxmox.com -- upload --product pve,pmg --dist bullseye
 
 .PHONY: clean distclean
 distclean: clean
-       rm -f examples/simple-demo.pem
+       ${MAKE} -C src $@
 
 clean:
-       rm -rf ./build *.deb *.changes *.buildinfo ${BTDIR} examples/simple-demo.lck
+       ${MAKE} -C src $@
+       rm -rf ${PACKAGE}-*/ *.deb *.changes *.buildinfo ${BTDIR} examples/simple-demo.lck
        find . -name '*~' -exec rm {} ';'
 
 .PHONY: dinstall