From 34dac70182e97ff703f24ba0e9b2b11ea48ee837 Mon Sep 17 00:00:00 2001
From: "wtc%netscape.com" <wtc%netscape.com>
Date: Wed, 7 May 2003 00:27:37 +0000
Subject: [PATCH] Bug 204681: fixed build failure with MKS Toolkit on Windows
 XP.  Handle the more general 0x pattern instead of just 00 in the output of
 "uname -v".

---
 security/coreconf/arch.mk | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/security/coreconf/arch.mk b/security/coreconf/arch.mk
index 277232c0c6d..ca2354c85ea 100644
--- a/security/coreconf/arch.mk
+++ b/security/coreconf/arch.mk
@@ -225,9 +225,8 @@ endif
 ifeq ($(OS_ARCH), Windows_NT)
     OS_ARCH = WINNT
     OS_MINOR_RELEASE := $(shell uname -v)
-    ifeq ($(OS_MINOR_RELEASE),00)
-	OS_MINOR_RELEASE = 0
-    endif
+    # strip leading 0
+    OS_MINOR_RELEASE := $(patsubst 0%,%,$(OS_MINOR_RELEASE))
     OS_RELEASE := $(OS_RELEASE).$(OS_MINOR_RELEASE)
     ifndef CPU_ARCH
 	CPU_ARCH := $(shell uname -m)