diff options
| author | christophe.ravel.bugs%sun.com <devnull@localhost> | 2006-12-06 21:14:54 +0000 |
|---|---|---|
| committer | christophe.ravel.bugs%sun.com <devnull@localhost> | 2006-12-06 21:14:54 +0000 |
| commit | 82d29ca6263e0412f3e2847c58e27f7f770ef679 (patch) | |
| tree | e809c0ebd8965e9fe35d863dddd256af516091b9 | |
| parent | d153a3cfaa38f68776d4945a7514adfaeac47685 (diff) | |
| download | nss-hg-82d29ca6263e0412f3e2847c58e27f7f770ef679.tar.gz | |
Bugzilla 362857 Simplify the NSS version string definition.
r+ wtchang
| -rw-r--r-- | security/nss/pkg/linux/Makefile | 3 | ||||
| -rwxr-xr-x | security/nss/pkg/solaris/Makefile-devl.com | 4 | ||||
| -rwxr-xr-x | security/nss/pkg/solaris/Makefile-tlsu.com | 4 | ||||
| -rw-r--r-- | security/nss/pkg/solaris/Makefile.com | 3 |
4 files changed, 10 insertions, 4 deletions
diff --git a/security/nss/pkg/linux/Makefile b/security/nss/pkg/linux/Makefile index a4ecce510..13e34131f 100644 --- a/security/nss/pkg/linux/Makefile +++ b/security/nss/pkg/linux/Makefile @@ -48,7 +48,8 @@ ifndef RPM_RELEASE RPM_RELEASE = 1 endif VERSION = `grep NSS_VERSION $(CORE_DEPTH)/../dist/public/nss/nss.h \ - | sed -e 's/"$$//' -e 's/.*"//' -e 's/ .*//'` + | head -1 \ + | sed -e 's/[^"]*"//' -e 's/".*//' -e 's/ .*//'` PWD = `pwd` BUILDROOT = $(PWD)\/$(NAME)-root diff --git a/security/nss/pkg/solaris/Makefile-devl.com b/security/nss/pkg/solaris/Makefile-devl.com index 5d28d5ffd..d7093b122 100755 --- a/security/nss/pkg/solaris/Makefile-devl.com +++ b/security/nss/pkg/solaris/Makefile-devl.com @@ -57,7 +57,9 @@ FILES = $(DATAFILES) pkginfo PACKAGE = $(shell basename `pwd`) -PRODUCT_VERSION = $(shell grep NSS_VERSION $(CORE_DEPTH)/nss/lib/nss/nss.h | sed -e 's/"$$//' -e 's/.*"//' -e 's/ .*//') +PRODUCT_VERSION = $(shell grep NSS_VERSION $(CORE_DEPTH)/nss/lib/nss/nss.h \ + | head -1 \ + | sed -e 's/"$$//' -e 's/.*"//' -e 's/ .*//') LN = /usr/bin/ln diff --git a/security/nss/pkg/solaris/Makefile-tlsu.com b/security/nss/pkg/solaris/Makefile-tlsu.com index 5d28d5ffd..d7093b122 100755 --- a/security/nss/pkg/solaris/Makefile-tlsu.com +++ b/security/nss/pkg/solaris/Makefile-tlsu.com @@ -57,7 +57,9 @@ FILES = $(DATAFILES) pkginfo PACKAGE = $(shell basename `pwd`) -PRODUCT_VERSION = $(shell grep NSS_VERSION $(CORE_DEPTH)/nss/lib/nss/nss.h | sed -e 's/"$$//' -e 's/.*"//' -e 's/ .*//') +PRODUCT_VERSION = $(shell grep NSS_VERSION $(CORE_DEPTH)/nss/lib/nss/nss.h \ + | head -1 \ + | sed -e 's/"$$//' -e 's/.*"//' -e 's/ .*//') LN = /usr/bin/ln diff --git a/security/nss/pkg/solaris/Makefile.com b/security/nss/pkg/solaris/Makefile.com index 297a2ee8f..0478ac1e3 100644 --- a/security/nss/pkg/solaris/Makefile.com +++ b/security/nss/pkg/solaris/Makefile.com @@ -57,7 +57,8 @@ FILES = $(DATAFILES) pkginfo prototype PACKAGE = $(shell basename `pwd`) PRODUCT_VERSION = $(shell grep NSS_VERSION $(CORE_DEPTH)/../dist/public/nss/nss.h \ - | sed -e 's/"$$//' -e 's/.*"//' -e 's/ .*//') + | head -1 \ + | sed -e 's/[^"]*"//' -e 's/".*//' -e 's/ .*//') LN = /usr/bin/ln CP = /usr/bin/cp |