buildsys: use dpkg-dev makefile helpers for pkg info

and build this ass arch independent all package, makes no sense else,
it has no binaries included...

This allows more easily to do away with that defines.mk

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>

diff --git a/Makefile b/Makefile
index 174ac7db2553bd59b34f35b2222d5587177603dd..16e25f091ad7f61dde458d2b1b094644b8328b24 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,8 @@
-include defines.mk
+include /usr/share/dpkg/pkg-info.mk
+
+PACKAGE=pve-xtermjs
+
+export VERSION=${DEB_VERSION_UPSTREAM_REVISION}
 
 XTERMJSVER=3.12.0
 XTERMJSTGZ=xterm-${XTERMJSVER}.tgz
@@ -7,10 +11,9 @@ XTERMDATA = ${XTERMJSDIR}/dist/
 
 SRCDIR=src
 
-ARCH:=$(shell dpkg-architecture -qDEB_BUILD_ARCH)
 GITVERSION:=$(shell cat .git/refs/heads/master)
 
-DEB=${PACKAGE}_${VERSION}_${ARCH}.deb
+DEB=${PACKAGE}_${VERSION}_all.deb
 
 all: ${DEB}
        @echo ${DEB}

diff --git a/debian/control b/debian/control
index e87e6e782d4ea327c7636d4759257d38293d8679..258862a8e7cfc5eac038b97defc2be1e56ec0cee 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Build-Depends: debhelper (>= 10~),
 Standards-Version: 3.8.3
 
 Package: pve-xtermjs
-Architecture: any
+Architecture: all
 Depends: libpve-common-perl (>= 5.0-23),
          libwww-perl,
          ${misc:Depends}

diff --git a/defines.mk b/defines.mk
deleted file mode 100644 (file)
index 67f25da..0000000
--- a/defines.mk
+++ /dev/null
@@ -1,8 +0,0 @@
-PACKAGE=pve-xtermjs
-VER=3.12.0
-PKGREL=1
-VERSION=${VER}-${PKGREL}
-
-BINDIR=${DESTDIR}/usr/bin
-PERLLIBDIR=${DESTDIR}/usr/share/perl5
-WWWBASEDIR=${DESTDIR}/usr/share/${PACKAGE}

diff --git a/src/Makefile b/src/Makefile
index f1f27ce015b61a7de5dd4cfd6cf8485619a96589..41645873cb70dfbe63c1391efffbaec5e723d10a 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,5 +1,3 @@
-include ../defines.mk
-
 all:
 
 .PHONY: install

diff --git a/src/PVE/CLI/Makefile b/src/PVE/CLI/Makefile
index 79b0db189a63d1d66c5061d7893df44301501c20..8ea5eff3272cc31e758bbb56d3a3e726dd53ec2c 100644 (file)
--- a/src/PVE/CLI/Makefile
+++ b/src/PVE/CLI/Makefile
@@ -1,4 +1,4 @@
-include ../../../defines.mk
+PERLLIBDIR=${DESTDIR}/usr/share/perl5
 
 all:
 

diff --git a/src/bin/Makefile b/src/bin/Makefile
index 6a6ed1c0a3126204b7dc6a9d4fa53ca8551dbbb4..a8c2842e3c888ad465f33c3473097e20d8ed1986 100644 (file)
--- a/src/bin/Makefile
+++ b/src/bin/Makefile
@@ -1,4 +1,4 @@
-include         ../../defines.mk
+BINDIR=${DESTDIR}/usr/bin
 
 .PHONY: install
 install: termproxy

diff --git a/src/www/Makefile b/src/www/Makefile
index 99914fad0ae835f0c3cc5fdcb284d0bc970f6408..a9effb03cfe0c41e4a877c16edb3ce1667b5941f 100644 (file)
--- a/src/www/Makefile
+++ b/src/www/Makefile
@@ -1,4 +1,4 @@
-include ../../defines.mk
+WWWBASEDIR=${DESTDIR}/usr/share/pve-xtermjs
 
 SOURCE = \
        addons/fit/fit.js \