diff options
| author | christophe.ravel.bugs%sun.com <devnull@localhost> | 2006-12-06 21:04:22 +0000 |
|---|---|---|
| committer | christophe.ravel.bugs%sun.com <devnull@localhost> | 2006-12-06 21:04:22 +0000 |
| commit | 177f00e139115d22835ec72f36562dd192100210 (patch) | |
| tree | 3b26072e8010d2763a91c5591dccbcb178c85c69 | |
| parent | e2d5014b0cd5a9d5c2c6942d828a689f048f57c2 (diff) | |
| download | nss-hg-177f00e139115d22835ec72f36562dd192100210.tar.gz | |
Bugzilla 362857 Simplify the NSS version string definition.
r+ wtchang
| -rw-r--r-- | security/nss/pkg/linux/Makefile | 2 | ||||
| -rwxr-xr-x | security/nss/pkg/solaris/Makefile-devl.com | 2 | ||||
| -rwxr-xr-x | security/nss/pkg/solaris/Makefile-tlsu.com | 2 | ||||
| -rw-r--r-- | security/nss/pkg/solaris/Makefile.com | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/security/nss/pkg/linux/Makefile b/security/nss/pkg/linux/Makefile index 75b4f6df9..13e34131f 100644 --- a/security/nss/pkg/linux/Makefile +++ b/security/nss/pkg/linux/Makefile @@ -49,7 +49,7 @@ RPM_RELEASE = 1 endif VERSION = `grep NSS_VERSION $(CORE_DEPTH)/../dist/public/nss/nss.h \ | head -1 \ - | sed -e 's/"$$//' -e 's/.*"//' -e 's/ .*//'` + | 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 7c0aab4b1..9a0116dc0 100755 --- a/security/nss/pkg/solaris/Makefile-devl.com +++ b/security/nss/pkg/solaris/Makefile-devl.com @@ -59,7 +59,7 @@ PACKAGE = $(shell basename `pwd`) PRODUCT_VERSION = $(shell grep NSS_VERSION $(CORE_DEPTH)/nss/lib/nss/nss.h \ | head -1 \ - | sed -e 's/"$$//' -e 's/.*"//' -e 's/ .*//') + | 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 7c0aab4b1..9a0116dc0 100755 --- a/security/nss/pkg/solaris/Makefile-tlsu.com +++ b/security/nss/pkg/solaris/Makefile-tlsu.com @@ -59,7 +59,7 @@ PACKAGE = $(shell basename `pwd`) PRODUCT_VERSION = $(shell grep NSS_VERSION $(CORE_DEPTH)/nss/lib/nss/nss.h \ | head -1 \ - | sed -e 's/"$$//' -e 's/.*"//' -e 's/ .*//') + | 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 46e804fa0..0478ac1e3 100644 --- a/security/nss/pkg/solaris/Makefile.com +++ b/security/nss/pkg/solaris/Makefile.com @@ -58,7 +58,7 @@ PACKAGE = $(shell basename `pwd`) PRODUCT_VERSION = $(shell grep NSS_VERSION $(CORE_DEPTH)/../dist/public/nss/nss.h \ | head -1 \ - | sed -e 's/"$$//' -e 's/.*"//' -e 's/ .*//') + | sed -e 's/[^"]*"//' -e 's/".*//' -e 's/ .*//') LN = /usr/bin/ln CP = /usr/bin/cp |