--- makefile	2010-07-09 12:55:34.000000000 +0200
+++ makefile-ufo2000	2010-07-09 21:52:02.000000000 +0200
@@ -42,7 +42,7 @@ UFO_VERSION := ${shell awk 'BEGIN {FS=sp
 
 ifneq ($(UFO_VERSION),)
 ifneq ($(UFO_SVNVERSION),)
-	DISTNAME := ufo2000-$(UFO_VERSION).$(UFO_SVNVERSION)
+	DISTNAME := ufo2000-$(UFO_VERSION)
 else
 	DISTNAME := ufo2000-$(UFO_VERSION)
 endif
@@ -306,8 +306,6 @@ lng-all: lng-bel lng-deu lng-est lng-fre
 binary-archive: all server
 ifdef win32
 # create win32 binary distributive
-	-svn delete --force $(DISTNAME)
-	svn export --native-eol "CRLF" . $(DISTNAME)
 	rm -R $(DISTNAME)/src
 	rm -R $(DISTNAME)/datfile
 	rm -R $(DISTNAME)/doxygen
@@ -315,11 +313,8 @@ ifdef win32
 	rm $(DISTNAME)/*.rc $(DISTNAME)/*.h
 	cp ufo2000.exe ufo2000-srv.exe $(DISTNAME)
 	7z a -tzip -mx -r $(DISTNAME).zip $(DISTNAME)
-	svn delete --force $(DISTNAME)
 else
 # create linux binary distributive
-	-svn delete --force $(DISTNAME)
-	svn export . $(DISTNAME)
 	rm -R $(DISTNAME)/src
 	rm -R $(DISTNAME)/datfile
 	rm -R $(DISTNAME)/doxygen
@@ -327,25 +322,19 @@ else
 	rm $(DISTNAME)/*.rc $(DISTNAME)/*.h
 	cp ufo2000 ufo2000-srv $(DISTNAME)
 	tar -czf $(DISTNAME).tar.gz $(DISTNAME)
-	svn delete --force $(DISTNAME)
 endif
 
 win32-installer: all server
 # create windows installer using NSIS
-	-svn delete --force $(DISTNAME)
-	svn export --native-eol "CRLF" . $(DISTNAME)
 	rm $(DISTNAME)/makefile* $(DISTNAME)/Seccast*
 	rm $(DISTNAME)/*.rc $(DISTNAME)/*.h
 	cp ufo2000.exe ufo2000-srv.exe $(DISTNAME)
 	sed 's,GAME_VERSION "installer",GAME_VERSION "$(UFO_VERSION).$(UFO_SVNVERSION)",g' < ufo2000.nsi > $(DISTNAME)/ufo2000.nsi
 	makensis $(DISTNAME)/ufo2000.nsi
 	cp $(DISTNAME)/$(DISTNAME).exe $(DISTNAME).exe
-	svn delete --force $(DISTNAME)
 
 win32-beta-installer: all server
 # create windows beta installer using NSIS
-	-svn delete --force $(DISTNAME)
-	svn export --native-eol "CRLF" . $(DISTNAME)
 	rm $(DISTNAME)/makefile* $(DISTNAME)/Seccast*
 	rm $(DISTNAME)/*.rc $(DISTNAME)/*.h
 	cp ufo2000.exe ufo2000-srv.exe $(DISTNAME)
@@ -354,32 +343,26 @@ win32-beta-installer: all server
 	sed 's,GAME_VERSION "installer",GAME_VERSION "$(UFO_VERSION).$(UFO_SVNVERSION)-beta",g' < $(DISTNAME)/ufo2000.nsi.1 > $(DISTNAME)/ufo2000.nsi
 	makensis $(DISTNAME)/ufo2000.nsi
 	cp $(DISTNAME)/$(DISTNAME)-beta.exe $(DISTNAME)-beta.exe
-	svn delete --force $(DISTNAME)
 
 source-bz2: 
 # create tar.bz2 archive with ufo2000 sources (on *nix systems)
 	-$(RM) $(DISTNAME)-src.tar.bz2
-	-svn delete --force $(DISTNAME)
-	svn export --native-eol "LF" . $(DISTNAME)
 	sed 's,unknown,$(UFO_SVNVERSION),g' < src/version.h > $(DISTNAME)/src/version.h
 	tar -cjf $(DISTNAME)-src.tar.bz2 $(DISTNAME)
-	svn delete --force $(DISTNAME)
 
 install: all server
 	# necessary in order to create a Debian/derivatives package with:
 	# dpkg-buildpackage -rfakeroot
 	# BEGIN copied from binary-gz target
-	-svn delete --force $(DISTNAME)
-	svn export . $(DISTNAME)
-	rm -R $(DISTNAME)/src
-	rm -R $(DISTNAME)/datfile
-	rm -R $(DISTNAME)/doxygen
-	rm $(DISTNAME)/makefile* $(DISTNAME)/Seccast*
-	rm $(DISTNAME)/*.rc $(DISTNAME)/*.h
-	cp ufo2000 ufo2000-srv $(DISTNAME)
+	rm -R src
+	rm -R datfile
+	rm -R doxygen
+	rm -R Seccast*
+	rm *.rc *.h
+	# cp ufo2000 ufo2000-srv $(DISTNAME)
 	# END copied from binary-gz target
-	install -d $(DESTDIR)/usr/share/games/ufo2000 $(DESTDIR)/usr/games
-	cp -a $(DISTNAME)/* $(DESTDIR)/usr/share/games/ufo2000
+	install -d -m 0755 $(DESTDIR)/usr/share/games/ufo2000 $(DESTDIR)/usr/games
+	cp -a * $(DESTDIR)/usr/share/games/ufo2000
 	find $(DESTDIR) -type d -print0 | xargs -0 chmod 755
 	find $(DESTDIR) -type f -print0 | xargs -0 chmod 644
 	mv $(DESTDIR)/usr/share/games/ufo2000/ufo2000 $(DESTDIR)/usr/games
@@ -387,6 +370,7 @@ install: all server
 	chmod 755 $(DESTDIR)/usr/games/ufo2000
 	chmod 755 $(DESTDIR)/usr/games/ufo2000-srv
 	cp -a $(DESTDIR)/usr/share/games/ufo2000/ufo2000.default.ini $(DESTDIR)/usr/share/games/ufo2000/ufo2000.ini
+	rm $(DESTDIR)/usr/share/games/ufo2000/makefile*
 
 html-docs: tools
 	./lua script/lumikki.lua docs-src/newweapons.lhtml > docs/newweapons.html