buildsys: more make job safety fixes

[lxcfs.git] / Makefile

diff --git a/Makefile b/Makefile
index d80af0608ec960d8a065bfb4d9acbba11c1139ca..14eae6aa895a7af94ae1fa9dc5e55ff90378a045 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -10,21 +10,23 @@ SRCTAR=${SRCDIR}.tgz
 ARCH:=$(shell dpkg-architecture -qDEB_BUILD_ARCH)
 GITVERSION:=$(shell cat .git/refs/heads/master)
 
-DEB=${PACKAGE}_${PKGVER}-${DEBREL}_${ARCH}.deb \
-    ${PACKAGE}-dbg_${PKGVER}-${DEBREL}_${ARCH}.deb
+DEB1=${PACKAGE}_${PKGVER}-${DEBREL}_${ARCH}.deb
+DEB2=${PACKAGE}-dbg_${PKGVER}-${DEBREL}_${ARCH}.deb
+DEBS=$(DEB1) $(DEB2)
 
 all: ${DEB}
 
 .PHONY: deb
-deb: ${DEB}
-${DEB}: ${SRCTAR}
+deb: $(DEBS)
+$(DEB2): $(DEB1)
+$(DEB1): $(SRCTAR)
        rm -rf ${SRCDIR}
        tar xf ${SRCTAR}
        cp -a debian ${SRCDIR}/debian
        echo "git clone git://git.proxmox.com/git/lxcfs.git\\ngit checkout ${GITVERSION}" >  ${SRCDIR}/debian/SOURCE
        echo "debian/SOURCE" >> ${SRCDIR}/debian/docs
        cd ${SRCDIR}; dpkg-buildpackage -rfakeroot -b -us -uc
-       #lintian ${DEB}
+       #lintian $(DEB)
 
 
 .PHONY: download
@@ -35,13 +37,13 @@ download ${SRCTAR}:
        mv ${SRCTAR}.tmp ${SRCTAR}
 
 .PHONY: upload
-upload: ${DEB}
+upload: $(DEBS)
        umount /pve/${RELEASE}; mount /pve/${RELEASE} -o rw 
        mkdir -p /pve/${RELEASE}/extra
        rm -f /pve/${RELEASE}/extra/${PACKAGE}_*.deb
        rm -f /pve/${RELEASE}/extra/${PACKAGE}-dbg_*.deb
        rm -f /pve/${RELEASE}/extra/Packages*
-       cp ${DEB} /pve/${RELEASE}/extra
+       cp $(DEBS) /pve/${RELEASE}/extra
        cd /pve/${RELEASE}/extra; dpkg-scanpackages . /dev/null > Packages; gzip -9c Packages > Packages.gz
        umount /pve/${RELEASE}; mount /pve/${RELEASE} -o ro
 
@@ -53,5 +55,5 @@ clean:
        find . -name '*~' -exec rm {} ';'
 
 .PHONY: dinstall
-dinstall: ${DEB}
-       dpkg -i ${DEB}
+dinstall: $(DEBS)
+       dpkg -i $(DEBS)