Update the installer specific files for PPC and fix a few minor bugs.

git-svn-id: svn://svn.icculus.org/quake3/trunk@912 edf5b092-35ff-0310-97b2-ce42778d08ea

3 files changed, 41 insertions, 8 deletions

diff --git a/code/unix/setup/Makefile b/code/unix/setup/Makefile
index a25cd65..487a94c 100644
--- a/code/unix/setup/Makefile
+++ b/code/unix/setup/Makefile
@@ -1,5 +1,5 @@
-VERSION=FIXME
-RELEASE=1
+VERSION=1.34
+RELEASE=rc2
 
 all:
 	VERSION=$(VERSION) RELEASE=$(RELEASE) ./doit
diff --git a/code/unix/setup/doit b/code/unix/setup/doit
index 2bf6176..b0480db 100755
--- a/code/unix/setup/doit
+++ b/code/unix/setup/doit
@@ -58,6 +58,22 @@ popd
 tar --owner=root --group=root -C ./image/tmp -cf ./image/ioquake3.x86_64.tar .
 rm -rf image/tmp
 
+mkdir image/tmp
+pushd image/tmp
+mkdir baseq3 demoq3 missionpack
+# ppc binaries
+install -m 755 $src/release-linux-ppc/ioquake3.ppc ioquake3.ppc
+install -m 755 $src/release-linux-ppc/ioq3ded.ppc ioq3ded.ppc
+install -m 644 $src/release-linux-ppc/baseq3/*.so baseq3
+install -m 644 $src/release-linux-ppc/missionpack/*.so missionpack
+pushd demoq3
+ln -s ../baseq3/*.so .
+popd
+popd
+
+tar --owner=root --group=root -C ./image/tmp -cf ./image/ioquake3.ppc.tar .
+rm -rf image/tmp
+
 # patch pk3 files
 install -m 644 ./idpatchpk3s.tar image/idpatchpk3s.tar
 install -m 644 ./idtapatchpk3s.tar image/idtapatchpk3s.tar
@@ -71,11 +87,14 @@ install -m 755 ./preuninstall.sh image/preuninstall.sh
 ### start script
 mkdir -p image/bin/Linux/x86
 mkdir -p image/bin/Linux/x86_64
+mkdir -p image/bin/Linux/ppc
 
 install -m 755 ioquake3.sh image/bin/Linux/x86/ioquake3
 install -m 755 ioq3demo.sh image/bin/Linux/x86/ioq3demo
 install -m 755 ioquake3.sh image/bin/Linux/x86_64/ioquake3
 install -m 755 ioq3demo.sh image/bin/Linux/x86_64/ioq3demo
+install -m 755 ioquake3.sh image/bin/Linux/ppc/ioquake3
+install -m 755 ioq3demo.sh image/bin/Linux/ppc/ioq3demo
 
 ### README, COPYING and EULA
 install -m 644 ../../../README image/README
diff --git a/code/unix/setup/setup.xml b/code/unix/setup/setup.xml
index 53bbb81..a9c63d9 100644
--- a/code/unix/setup/setup.xml
+++ b/code/unix/setup/setup.xml
@@ -52,9 +52,9 @@
    </option>
   </component>
   <component arch="x86_64" name="x86_64" version="@VERSION@">
-    <option arch="x86_64" install="true">
-     64 bit binaries
-     <binary arch="any" libc="any" symlink="ioquake3" icon="quake3.png"
+    <option install="true">
+     x86_64 binaries
+     <binary libc="any" symlink="ioquake3" icon="quake3.png"
              menu="." name="ioquake3">
        ioquake3
      </binary>
@@ -66,9 +66,9 @@
   </component>
 
   <component if="|(x86,x86_64)" name="i386" version="@VERSION@">
-    <option arch="any" install="true">
-     32 bit binaries
-     <binary arch="any" libc="any" symlink="ioquake3" icon="quake3.png"
+    <option install="true">
+     x86 (32 bit) binaries
+     <binary libc="any" symlink="ioquake3" icon="quake3.png"
              menu="." name="ioquake3">
        ioquake3
      </binary>
@@ -79,6 +79,20 @@
     </option>
   </component>
 
+  <component arch="ppc" name="ppc" version="@VERSION@">
+    <option install="true">
+     ppc 32 bit binaries
+     <binary libc="any" symlink="ioquake3" icon="quake3.png"
+             menu="." name="ioquake3">
+       ioquake3
+     </binary>
+     <files>
+       ioquake3.ppc.tar
+       quake3.png
+     </files>
+    </option>
+  </component>
+
   <cdrom id="CD 1" name="Quake 3 Arena installation CD">
     Setup/BaseEF/pak0.pk3
   </cdrom>