From e64e1e12a75e8f8d318f03c2e70c6f5bb8d79594 Mon Sep 17 00:00:00 2001
From: "wtc%netscape.com" <none@none>
Date: Mon, 21 Jul 2003 23:40:51 +0000
Subject: [PATCH] Bugzilla bug 213192: take the first two components of
 $(OS_RELEASE) the right way.  The basename function that we were using only
 works when $(OS_RELEASE) has exactly three components.  The patch is
 contributed by Ed Catmur <ed@catmur.co.uk>.  r=wtc.

---
 security/coreconf/arch.mk | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/security/coreconf/arch.mk b/security/coreconf/arch.mk
index a49ffacb05..d10cd56139 100644
--- a/security/coreconf/arch.mk
+++ b/security/coreconf/arch.mk
@@ -146,7 +146,10 @@ ifeq (,$(filter-out Linux FreeBSD IRIX,$(OS_ARCH)))
 endif
 
 ifeq ($(OS_ARCH),Linux)
-    OS_RELEASE := $(basename $(OS_RELEASE))
+    OS_RELEASE := $(subst ., ,$(OS_RELEASE))
+    ifneq ($(words $(OS_RELEASE)),1)
+	OS_RELEASE := $(word 1,$(OS_RELEASE)).$(word 2,$(OS_RELEASE))
+    endif
 endif
 
 #