Order

[xonotic/gmqcc.git] / distro / Makefile

diff --git a/distro/Makefile b/distro/Makefile
index 49555b895f43ebf8b4f4b1f5367b5224bea420bb..08dfe3f6aa5b621a748148abf6274ab2cec62d57 100644 (file)
--- a/distro/Makefile
+++ b/distro/Makefile
@@ -1,7 +1,7 @@
 DROPBOX := dropbox_uploader.sh
 UNAME   := $(shell uname -m)
 DOWNLOAD:= ../doc/html/download.c
-BRANCH  := $(shell git branch | sed -n -e 's/^\* \(.*\)/\1/p')
+BRANCH  := $(shell git rev-parse --abbrev-ref HEAD)
 ifneq ($(shell uname -m), x86_64)
     $(error Cannot build packages without an x86_64 capable CPU)
 endif
@@ -10,16 +10,22 @@ endif
 .NOTPARALLEL: upload
 
 base:
+       @echo "Building Debian packages ..."
        $(MAKE) -C deb/
        $(MAKE) -C deb/ CARCH=i686
+       @echo "Building Archlinux packages ..."
        $(MAKE) -C archlinux/this/
        $(MAKE) -C archlinux/this/ CARCH=i686
-       $(MAKE) -C win32/
+       @echo "Building Slackware packages ..."
        $(MAKE) -C slackware/this/
        $(MAKE) -C slackware/this/ CARCH=i686
+       @echo "Building Windows packages ..."
+       $(MAKE) -C win32/
+       $(MAKE) -C win64/
        @mv deb/*.deb ./
        @mv archlinux/this/*pkg.tar.xz ./
        @mv win32/*.zip ./
+       @mv win64/*.zip ./
        @mv slackware/this/*.txz ./
 
 upload: