From: Rudolf Polzer <divVerent@xonotic.org>
Date: Mon, 20 Dec 2010 07:27:43 +0000 (+0100)
Subject: more release-win32 fixes
X-Git-Tag: xonotic-v0.5.0~105
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=3fc0434acf4cb28ec9d739f1051ff19d4f34bf65;p=xonotic%2Fnetradiant.git

more release-win32 fixes
---

diff --git a/Makefile b/Makefile
index e8e0b256..dce2ca7c 100644
--- a/Makefile
+++ b/Makefile
@@ -1015,14 +1015,15 @@ release-src: INSTALLDIR := netradiant-$(RADIANT_VERSION_NUMBER)-$(BUILD_DATE)
 release-src: RADIANT_ABOUTMSG := Official release build
 release-src: BUILD := release
 release-src:
-	$(GIT) archive --format=tar HEAD | bzip2 > $(INSTALLDIR).tar.bz2
+	$(GIT) archive --format=tar --prefix=$(INSTALLDIR)/ HEAD | bzip2 > $(INSTALLDIR).tar.bz2
 
 release-win32: BUILD_DATE := $(shell date +%Y%m%d)
 release-win32: MAKEFILE_CONF := cross-Makefile.conf
 release-win32: INSTALLDIR := netradiant-$(RADIANT_VERSION_NUMBER)-$(BUILD_DATE)
 release-win32: RADIANT_ABOUTMSG := Official release build
 release-win32: BUILD := release
-release-win32: all
+release-win32:
+	$(MAKE) all
 	7za a -sfx../../../../../../../../../../$(HOME)/7z.sfx $(INSTALLDIR)-win32-7z.exe $(INSTALLDIR)/
 	$(MAKE) clean