Skip to content
Permalink
Browse files
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.
  • Loading branch information
wtc%netscape.com committed Jul 21, 2003
1 parent 8c1d3c5 commit e64e1e12a75e8f8d318f03c2e70c6f5bb8d79594
Showing with 4 additions and 1 deletion.
  1. +4 −1 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

#

0 comments on commit e64e1e1

Please sign in to comment.