From 259f104b7cae132631205f8540a6cfae323db742 Mon Sep 17 00:00:00 2001 From: "wtc%netscape.com" Date: Mon, 21 Jul 2003 23:36:44 +0000 Subject: [PATCH] Bugzilla bug 213192: take the first two components of $(OS_RELEASE) the right way. The basename function we were using only works when $(OS_RELEASE) has exactly three components. The patch is contributed by Ed Catmur . r=wtc. Tag: NSS_3_8_BRANCH git-svn-id: svn://10.0.0.236/branches/NSS_3_8_BRANCH@145039 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/security/coreconf/arch.mk | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mozilla/security/coreconf/arch.mk b/mozilla/security/coreconf/arch.mk index 2f5a506d20e..cc44690f350 100644 --- a/mozilla/security/coreconf/arch.mk +++ b/mozilla/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 #