Order

[xonotic/gmqcc.git] / distro / Makefile

diff --git a/distro/Makefile b/distro/Makefile
index 96ddce2946db1495998ddb3fc229a67b47f2cd30..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,14 +10,23 @@ 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
+       @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:
        @echo "APPKEY:76vh3q42hnvmzm3" > dropbox_config
@@ -28,7 +37,7 @@ upload:
        @wget -q "http://raw.github.com/andreafabrizi/Dropbox-Uploader/master/dropbox_uploader.sh"
        @chmod +x dropbox_uploader.sh
        @sed -i -e "s/~\/.dropbox_uploader/.\/dropbox_config/g" $$(basename $(DROPBOX))
-       @find . -type f -regex ".*/.*\.\(xz\|deb\|zip\)" -exec ./$$(basename $(DROPBOX)) upload {} \;
+       @find . -type f -regex ".*/.*\.\(xz\|deb\|zip\|txz\)" -exec ./$$(basename $(DROPBOX)) upload {} \;
        @rm dropbox_config dropbox_uploader.sh
 
 website:
@@ -49,5 +58,6 @@ clean:
        @rm -f *.zip
        @rm -f *.gen
        @rm -f *.html
+       @rm -f *.txz
 
 all: base upload