adopt/fix Makefile for our build environment

diff --git a/Makefile b/Makefile
index b78335504e3e540fdf8e75216b5c17f82087e906..96fa09953e50981a4974357fb30fc28f55437ec3 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,13 +1,14 @@
-RELEASE=4.2.0
+RELEASE=4.0

 
 VERSION=4.2.0
 
 VERSION=4.2.0

-IPRELEASE=1
+PKGREL=1
+

 DIR=iproute2-${VERSION}
 SRC=iproute2-${VERSION}.orig.tar.gz
 
 DIR=iproute2-${VERSION}
 SRC=iproute2-${VERSION}.orig.tar.gz
 

+ARCH:=$(shell dpkg-architecture -qDEB_BUILD_ARCH)

 
 

-DEBS=                                                          \
-       iproute2_${VERSION}-${IPRELEASE}.deb                    \
+DEBS=iproute2_${VERSION}-${PKGREL}_${ARCH}.deb

 
 all: ${DEBS}
        echo ${DEBS}
 
 all: ${DEBS}
        echo ${DEBS}


@@ -27,8 +28,9 @@ download:
 
 .PHONY: upload
 upload: ${DEBS}
 
 .PHONY: upload
 upload: ${DEBS}

+       umount /pve/${RELEASE}; mount /pve/${RELEASE} -o rw

        mkdir -p /pve/${RELEASE}/extra
        mkdir -p /pve/${RELEASE}/extra

-       rm -f /pve/${RELEASE}/extra/libqb*.deb
+       rm -f /pve/${RELEASE}/extra/iproute2_*.deb

        rm -f /pve/${RELEASE}/extra/Packages*
        cp ${DEBS} /pve/${RELEASE}/extra
        cd /pve/${RELEASE}/extra; dpkg-scanpackages . /dev/null > Packages; gzip -9c Packages > Packages.gz
        rm -f /pve/${RELEASE}/extra/Packages*
        cp ${DEBS} /pve/${RELEASE}/extra
        cd /pve/${RELEASE}/extra; dpkg-scanpackages . /dev/null > Packages; gzip -9c Packages > Packages.gz