buildsys: create buildir atomically

[arch-pacman.git] / Makefile

diff --git a/Makefile b/Makefile
index 014851c7a0b3b9e7731678109b7bbb9e8803ac29..3b23b128cbee0414dc1ffbe983d568c4338247fc 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 PACKAGE=arch-pacman
-PACMANVER=5.1.2
+PACMANVER=5.1.3
 DEBREL=1
 
 SRCDIR=pacman
@@ -10,18 +10,27 @@ GITVERSION:=$(shell cat .git/refs/heads/master)
 
 DEB=${PACKAGE}_${PACMANVER}-${DEBREL}_amd64.deb
 DEB2=${PACKAGE}-dev_${PACMANVER}-${DEBREL}_amd64.deb \
-     ${PACKAGE}-dbg_${PACMANVER}-${DEBREL}_amd64.deb
+     ${PACKAGE}-dbgsym_${PACMANVER}-${DEBREL}_amd64.deb
 
 DEBS= ${DEB} ${DEB2}
 
 all: ${DEBS}
        echo ${DEBS}
 
-${DEB}: ${SRCTAR}
+${SRCDIR}: ${SRCTAR}
+       rm -rf ${SRCDIR}.tmp
+       mkdir ${SRCDIR}.tmp
+       tar xf ${SRCTAR} -C ${SRCDIR}.tmp --strip-components 1
+       cp -a debian ${SRCDIR}.tmp/debian
+       mv ${SRCDIR}.tmp ${SRCDIR}
+
+.PHONY: builddir
+builddir:
        rm -rf ${SRCDIR}
-       tar xf ${SRCTAR}
-       cp -a debian ${SRCDIR}/debian
-       echo "git clone git://projects.archlinux.org/pacman.git\\ngit checkout ${GITVERSION}" >  ${SRCDIR}/debian/SOURCE
+       $(MAKE) ${SRCDIR}
+
+${DEB}: builddir
+       echo "git clone https://gitlab.archlinux.org/pacman/pacman.git\\ngit checkout ${GITVERSION}" >  ${SRCDIR}/debian/SOURCE
        cd ${SRCDIR}; DEB_BUILD_OPTIONS=nocheck dpkg-buildpackage -rfakeroot -b -us -uc
        lintian ${DEBS}
 
@@ -32,12 +41,13 @@ deb ${DEB2}: ${DEB}
 download: ${SRCTAR}
 ${SRCTAR}:
        rm -rf ${SRCDIR} ${SRCTAR} pacman-git
-       git clone --depth=1 --branch=v${PACMANVER} git://projects.archlinux.org/pacman.git pacman-git
+       git clone --depth=1 --branch=v${PACMANVER} https://gitlab.archlinux.org/pacman/pacman.git pacman-git
        (cd pacman-git && git archive --prefix=${SRCDIR}/ --format=tar v${PACMANVER}) | gzip > ${SRCTAR}.tmp
        mv ${SRCTAR}.tmp ${SRCTAR}
        rm -rf pacman-git
 
 distclean: clean
+       rm -rf ${SRCDIR} ${SRCTAR} pacman-git
 
 .PHONY: clean
 clean: