r395 - trunk/code/unix/setup

DONOTREPLY at icculus.org DONOTREPLY at icculus.org
Thu Dec 1 04:54:14 EST 2005


Author: ludwig
Date: 2005-12-01 04:54:14 -0500 (Thu, 01 Dec 2005)
New Revision: 395

Modified:
   trunk/code/unix/setup/doit
Log:
fix the stupid i386/x86/amd64/x86_64 weirdness


Modified: trunk/code/unix/setup/doit
===================================================================
--- trunk/code/unix/setup/doit	2005-12-01 00:24:21 UTC (rev 394)
+++ trunk/code/unix/setup/doit	2005-12-01 09:54:14 UTC (rev 395)
@@ -10,8 +10,13 @@
 set -x
 
 arch=`uname -m`
+
+# $§&%!!
+setup_arch=$arch
+links=
 case "$arch" in
-	i?86) arch=i386 ;;
+	i?86) arch=i386; setup_arch=x86; links="amd64 x86_64" ;;
+	x86_64) links=amd64
 esac
 
 rm -rf image
@@ -45,10 +50,12 @@
 sed 's/@VERSION@/'$VERSION'/g' < setup.xml > image/setup.data/setup.xml
 
 ### start script
-mkdir -p image/bin/Linux/$arch
-ln -s x86_64 image/bin/Linux/amd64 # $§&%!!
-install -m 755 ioquake3.sh image/bin/Linux/$arch/ioquake3
-install -m 755 ioq3demo.sh image/bin/Linux/$arch/ioq3demo
+mkdir -p image/bin/Linux/$setup_arch
+for i in $links; do
+	ln -s $setup_arch image/bin/Linux/$i
+done
+install -m 755 ioquake3.sh image/bin/Linux/$setup_arch/ioquake3
+install -m 755 ioq3demo.sh image/bin/Linux/$setup_arch/ioq3demo
 
 ### README and COPYING
 install -m 644 ../../../README image/README




More information about the quake3-commits mailing list