buildsys: cleanup variable names/grouping

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

diff --git a/Makefile b/Makefile
index 0060296534805ef7beefb320fd1095138348e8ed..ce8aa0afd4f6b5d33913026e1e155ce0596c2497 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -2,14 +2,16 @@ include /usr/share/dpkg/pkg-info.mk
 export DEB_VERSION_UPSTREAM_REVISION
 
 export PACKAGE=proxmox-widget-toolkit
 export DEB_VERSION_UPSTREAM_REVISION
 
 export PACKAGE=proxmox-widget-toolkit

-BUILDDIR ?= ${PACKAGE}-${DEB_VERSION_UPSTREAM}
-WT_DEB=${PACKAGE}_${DEB_VERSION_UPSTREAM_REVISION}_all.deb
-WT_DEV_DEB=${PACKAGE}-dev_${DEB_VERSION_UPSTREAM_REVISION}_all.deb
-DEBS=${WT_DEB} ${WT_DEV_DEB}
+
+DEB=${PACKAGE}_${DEB_VERSION_UPSTREAM_REVISION}_all.deb
+DEV_DEB=${PACKAGE}-dev_${DEB_VERSION_UPSTREAM_REVISION}_all.deb
+
+DEBS=${DEB} ${DEV_DEB}

 DSC=${PACKAGE}_${DEB_VERSION_UPSTREAM_REVISION}.dsc
 
 DSC=${PACKAGE}_${DEB_VERSION_UPSTREAM_REVISION}.dsc
 

-GITVERSION:=$(shell git rev-parse HEAD)
+BUILDDIR ?= ${PACKAGE}-${DEB_VERSION_UPSTREAM}

 
 

+${BUILDDIR}: GITVERSION:=$(shell git rev-parse HEAD)

 ${BUILDDIR}:
        rm -rf ${BUILDDIR} ${BUILDDIR}.tmp
        cp -a src/ ${BUILDDIR}.tmp
 ${BUILDDIR}:
        rm -rf ${BUILDDIR} ${BUILDDIR}.tmp
        cp -a src/ ${BUILDDIR}.tmp