r1321 - in packages/trunk/gtkradiant/debian: . patches

[Frits Daalmans]

Author: fritsd-guest
Date: 2006-08-07 23:48:28 +0000 (Mon, 07 Aug 2006)
New Revision: 1321

Added:
   packages/trunk/gtkradiant/debian/patches/60_get_arch.dpatch
Modified:
   packages/trunk/gtkradiant/debian/patches/00list
   packages/trunk/gtkradiant/debian/rules
Log:
Attempt to fix x86-specific rules in SConstruct
Install should now work on any architecture (where it compiles).
Can someone please test this on a ppc machine (which I don't have available)!


Modified: packages/trunk/gtkradiant/debian/patches/00list
===================================================================
--- packages/trunk/gtkradiant/debian/patches/00list	2006-08-07 19:32:50 UTC (rev 1320)
+++ packages/trunk/gtkradiant/debian/patches/00list	2006-08-07 23:48:28 UTC (rev 1321)
@@ -4,3 +4,4 @@
 20_subversion_ugly_hack.dpatch
 30_debian_specific_changes.dpatch
 50_minor_warnings.dpatch
+60_get_arch.dpatch

Added: packages/trunk/gtkradiant/debian/patches/60_get_arch.dpatch
===================================================================
--- packages/trunk/gtkradiant/debian/patches/60_get_arch.dpatch	2006-08-07 19:32:50 UTC (rev 1320)
+++ packages/trunk/gtkradiant/debian/patches/60_get_arch.dpatch	2006-08-07 23:48:28 UTC (rev 1321)
@@ -0,0 +1,38 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## get_arch.dpatch by  <frits at pontifex2.thuis>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: get_arch
+
+ at DPATCH@
+
+Index: get_arch.sh
+===================================================================
+--- old/debian/get_arch.tmp.sh	(revision 0)
++++ old/debian/get_arch.tmp.sh	(revision 150)
+@@ -0,0 +1,24 @@
++#!/bin/bash
++# this script is needed to determine the architecture version
++# in exactly the same way as the scons script, SConstruct
++g_cpu=`uname -m`
++
++known=0
++if [ "$g_cpu" = "Power Macintosh" ]; then
++  g_cpu="ppc"
++  known=1
++fi
++if [ "$g_cpu" = "ppc" ]; then
++  # g_cpu="ppc"
++  known=1
++fi
++
++if [ `echo $g_cpu |grep -c 'i.86'` -eq 1 ]; then
++  g_cpu="x86"
++  known=1
++fi
++if [ $known -eq 0 ]; then
++  g_cpu="cpu"
++fi
++
++echo $g_cpu
+

Modified: packages/trunk/gtkradiant/debian/rules
===================================================================
--- packages/trunk/gtkradiant/debian/rules	2006-08-07 19:32:50 UTC (rev 1320)
+++ packages/trunk/gtkradiant/debian/rules	2006-08-07 23:48:28 UTC (rev 1321)
@@ -6,7 +6,9 @@
 
 DESTDIR=$(CURDIR)/debian/gtkradiant
 # not sure how to do this nicely..
-GTKRADIANT_TARGET_ARCH=i686
+#GTKRADIANT_TARGET_ARCH=i686
+# made a temporary script (dpatch #60); where should this normally go?
+GTKRADIANT_TARGET_ARCH=`sh $(CURDIR)/debian/get_arch.tmp.sh`
 
 
 
@@ -45,6 +47,7 @@
 	rm -f gtkradiant.6 q3data.6 q3map2.6 radiant.6
 	rm -f site.conf 
 	rm -f include/aboutmsg.h include/RADIANT_MAJOR include/version.h include/RADIANT_MINOR include/version
+	rm -f debian/get_arch.tmp.sh
 	dh_clean 
 
 install: build
@@ -58,9 +61,9 @@
 	cp setup/data/tools/gl/* $(DESTDIR)/usr/share/games/gtkradiant/gl/
 	mkdir -p $(DESTDIR)/usr/share/games/gtkradiant/bitmaps
 	cp setup/data/tools/bitmaps/* $(DESTDIR)/usr/share/games/gtkradiant/bitmaps/
-	mv install/q3data.x86 $(DESTDIR)/usr/games/q3data
-	mv install/q3map2.x86 $(DESTDIR)/usr/games/q3map2
-	mv install/radiant.x86 $(DESTDIR)/usr/games/radiant
+	mv install/q3data.$(GTKRADIANT_TARGET_ARCH) $(DESTDIR)/usr/games/q3data
+	mv install/q3map2.$(GTKRADIANT_TARGET_ARCH) $(DESTDIR)/usr/games/q3map2
+	mv install/radiant.$(GTKRADIANT_TARGET_ARCH) $(DESTDIR)/usr/games/radiant
 	mkdir -p $(DESTDIR)/usr/lib/games/gtkradiant/modules
 	cp install/modules/* $(DESTDIR)/usr/lib/games/gtkradiant/modules/
 	cd $(DESTDIR)/usr/share/games/gtkradiant/; ln -s /usr/lib/games/gtkradiant/modules modules; cd -