more release-win32 fixes

diff --git a/Makefile b/Makefile
index e8e0b256871eb7d7c25084f4a7f10a049338960e..dce2ca7ccee2b3504fe18557f9f0764c05f3806b 100644 (file)
--- 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