diff options
author | wtchang%redhat.com <devnull@localhost> | 2005-04-15 00:28:40 +0000 |
---|---|---|
committer | wtchang%redhat.com <devnull@localhost> | 2005-04-15 00:28:40 +0000 |
commit | 88ff11b20f652d1b723536ec223b7ef958d4de3e (patch) | |
tree | 21f6aad47ecc0e3158d5192d71d65ce136895aeb | |
parent | 2824d00a2560e16ea1d31f245c37612708b250ef (diff) | |
download | nss-hg-88ff11b20f652d1b723536ec223b7ef958d4de3e.tar.gz |
Bugzilla Bug 290217: in the "gmake import" build method, import NSPR 4.6
and do not import DBM. Instead, build DBM from sources. r=relyea.
a=christophe.ravel.
Modified files: manifest.mn Makefile
-rw-r--r-- | security/nss/Makefile | 2 | ||||
-rw-r--r-- | security/nss/manifest.mn | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/security/nss/Makefile b/security/nss/Makefile index 1c1e47ea6..b6e9e64b4 100644 --- a/security/nss/Makefile +++ b/security/nss/Makefile @@ -166,7 +166,7 @@ else endif endif -nss_RelEng_bld: build_coreconf import all +nss_RelEng_bld: build_coreconf import build_dbm all package: $(MAKE) -C pkg publish diff --git a/security/nss/manifest.mn b/security/nss/manifest.mn index 54d4f268f..b080f94d6 100644 --- a/security/nss/manifest.mn +++ b/security/nss/manifest.mn @@ -37,8 +37,7 @@ CORE_DEPTH = .. DEPTH = .. -IMPORTS = nspr20/v4.4.1 \ - dbm/DBM_1_61_RTM \ +IMPORTS = nspr20/v4.6 \ $(NULL) RELEASE = nss |