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 <ed@catmur.co.uk>. 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
This commit is contained in:
@@ -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
|
||||
|
||||
#
|
||||
|
||||
Reference in New Issue
Block a user