- Remove arch name in resulting file as the file should contain all arches.

- Make sure to delete all files that don't get uninstalled automatically before uninstall process begins.

code/unix/setup/doit

@@ -79,4 +79,4 @@ install -m 644 ../../../COPYING.txt image/COPYING
 install -m 644 ./id_patch_pk3s_Q3A_EULA.txt image/id_patch_pk3s_Q3A_EULA.txt
 
 ### makeself installer
-$MAKESELF/makeself.sh image ioquake3-$VERSION-$RELEASE.$arch.run "ioquake3 $VERSION" ./setup.sh
+$MAKESELF/makeself.sh image ioquake3-$VERSION-$RELEASE.run "ioquake3 $VERSION" ./setup.sh

code/unix/setup/preuninstall.sh

@@ -0,0 +1,3 @@
+#!/bin/sh
+rm COPYING
+rmdir --ignore-fail-on-non-empty demoq3 missionpack

code/unix/setup/setup.xml

@@ -5,7 +5,8 @@
 	update_url="http://www.icculus.org/quake3/updates.txt"
 	promptbinaries="yes"
 	reinstall="yes"
-	nopromptoverwrite="yes">
+	nopromptoverwrite="yes"
+	preuninstall="preuninstall.sh">
   <readme>
     README
   </readme>