From 9f5c10e17559f1a338c546cbb612bab3c22362be Mon Sep 17 00:00:00 2001
From: Andres Salomon <dilinger@debian.org>
Date: Mon, 11 Jul 2005 04:40:06 +0000
Subject: [PATCH] make the subarch variable not empty

svn path=/trunk/kernel/source/linux-kernel-2.6.12/; revision=3460
---
 debian/rules | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/debian/rules b/debian/rules
index a0b58dd66..9b608de0d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -224,11 +224,14 @@ archs := $(shell find debian/arch/ -mindepth 1 -maxdepth 1 -type d ! -name '.svn
 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'		\