diff options
| author | wtc%google.com <devnull@localhost> | 2009-11-07 05:57:41 +0000 |
|---|---|---|
| committer | wtc%google.com <devnull@localhost> | 2009-11-07 05:57:41 +0000 |
| commit | b5142d4c98ac39b13d1026c0b0e30bae57651624 (patch) | |
| tree | 8e980206344673350b316e16a0b4bb362617476e | |
| parent | 961a72b4207dd5781d21f6f8e79bce647e791c48 (diff) | |
| download | nss-hg-b5142d4c98ac39b13d1026c0b0e30bae57651624.tar.gz | |
Bug 275744: nss/cmd/zlib has just been copied to nss/lib/zlib. Switch over
to the new location of zlib. r=nelson.
Modified Files:
cmd/manifest.mn cmd/Makefile lib/manifest.mn lib/Makefile
| -rw-r--r-- | security/nss/cmd/Makefile | 4 | ||||
| -rw-r--r-- | security/nss/cmd/manifest.mn | 1 | ||||
| -rw-r--r-- | security/nss/lib/Makefile | 4 | ||||
| -rw-r--r-- | security/nss/lib/manifest.mn | 2 |
4 files changed, 5 insertions, 6 deletions
diff --git a/security/nss/cmd/Makefile b/security/nss/cmd/Makefile index ed5819847..67dd375ab 100644 --- a/security/nss/cmd/Makefile +++ b/security/nss/cmd/Makefile @@ -46,10 +46,6 @@ ifdef BUILD_LIBPKIX_TESTS DIRS += libpkix endif -ifndef USE_SYSTEM_ZLIB -ZLIB_SRCDIR = zlib # Add the zlib directory to DIRS. -endif - INCLUDES += \ -I$(DIST)/../public/security \ -I./include \ diff --git a/security/nss/cmd/manifest.mn b/security/nss/cmd/manifest.mn index dc7c8a777..4032e8131 100644 --- a/security/nss/cmd/manifest.mn +++ b/security/nss/cmd/manifest.mn @@ -41,7 +41,6 @@ DEPTH = ../.. REQUIRES = nss nspr libdbm DIRS = lib \ - $(ZLIB_SRCDIR) \ addbuiltin \ atob \ bltest \ diff --git a/security/nss/lib/Makefile b/security/nss/lib/Makefile index 029f5812e..e6158a82c 100644 --- a/security/nss/lib/Makefile +++ b/security/nss/lib/Makefile @@ -58,6 +58,10 @@ include $(CORE_DEPTH)/coreconf/config.mk # (4) Include "local" platform-dependent assignments (OPTIONAL). # ####################################################################### +ifndef USE_SYSTEM_ZLIB +ZLIB_SRCDIR = zlib # Add the zlib directory to DIRS. +endif + ifeq ($(OS_TARGET), WINCE) DIRS := $(filter-out fortcrypt,$(DIRS)) endif diff --git a/security/nss/lib/manifest.mn b/security/nss/lib/manifest.mn index 935c2ccf6..65fe3eb6e 100644 --- a/security/nss/lib/manifest.mn +++ b/security/nss/lib/manifest.mn @@ -52,7 +52,7 @@ DIRS = util freebl softoken \ base dev pki pki1 \ libpkix \ certdb certhigh pk11wrap cryptohi nss \ - ssl \ + $(ZLIB_SRCDIR) ssl \ pkcs12 pkcs7 smime \ crmf jar \ ckfw \ |