From 4d062b1b84bd4d01a29b1ceba840d5359a7e5260 Mon Sep 17 00:00:00 2001
From: Thilo Schulz <arny@ats.s.bawue.de>
Date: Tue, 5 Sep 2006 13:24:34 +0000
Subject: [PATCH] - 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            | 2 +-
 code/unix/setup/preuninstall.sh | 3 +++
 code/unix/setup/setup.xml       | 3 ++-
 3 files changed, 6 insertions(+), 2 deletions(-)
 create mode 100644 code/unix/setup/preuninstall.sh

diff --git a/code/unix/setup/doit b/code/unix/setup/doit
index 835ec19c..30e3503b 100755
--- a/code/unix/setup/doit
+++ b/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
diff --git a/code/unix/setup/preuninstall.sh b/code/unix/setup/preuninstall.sh
new file mode 100644
index 00000000..f9ad4163
--- /dev/null
+++ b/code/unix/setup/preuninstall.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+rm COPYING
+rmdir --ignore-fail-on-non-empty demoq3 missionpack
diff --git a/code/unix/setup/setup.xml b/code/unix/setup/setup.xml
index 115dbe1f..f6f80b8d 100644
--- a/code/unix/setup/setup.xml
+++ b/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>