r3460 - trunk/kernel/source/linux-kernel-2.6.12/debian

[Andres Salomon]

Author: dilinger
Date: 2005-07-11 04:40:06 +0000 (Mon, 11 Jul 2005)
New Revision: 3460

Modified:
   trunk/kernel/source/linux-kernel-2.6.12/debian/rules
Log:
make the subarch variable not empty


Modified: trunk/kernel/source/linux-kernel-2.6.12/debian/rules
===================================================================
--- trunk/kernel/source/linux-kernel-2.6.12/debian/rules	2005-07-11 03:53:31 UTC (rev 3459)
+++ trunk/kernel/source/linux-kernel-2.6.12/debian/rules	2005-07-11 04:40:06 UTC (rev 3460)
@@ -224,11 +224,14 @@
 debian/control: debian/templates/control.main.in
 	rm -f control.tmp 2>/dev/null
 	substitute() {					\
+		sa_tmp="debian/arch/$$2/*/config.$$3";	\
+		sa="";					\
+		[ -f $$sa_tmp ] && sa=$$(basename $$(dirname $$sa_tmp)); \
 		cat debian/templates/control.$$1 |	\
 		sed -e 's/@version@/$(version)/g'       \
 		    -e 's/@major@/$(major)/g'		\
 		    -e "s/@arch@/$$2/g"			\
-		    -e 's/@subarch@//g'			\
+		    -e "s/@subarch@/$$sa/g"		\
 		    -e "s/@flavour@/$$3/g"		\
 		    -e 's/@ltver@/$(ltver)/g'           \
 		    -e 's/@srcver@/$(srcver)/g'		\