Bug 845556, adjust Makefiles and tests to new NSS directory layout, r=wtc
authorKai Engert <kaie@kuix.de>
Thu, 28 Feb 2013 15:00:17 +0100
changeset 10687 c1590d7c2d794233aa424a9bbd127030eb882782
parent 10686 b4f684c82747c6a02523546397aeae8ec25066ec
child 10688 566aa414fe0cc8e6a21ccc3e05976850fdb2b11e
push id2
push userkaie@kuix.de
push dateThu, 28 Feb 2013 14:00:25 +0000
reviewerswtc
bugs845556
Bug 845556, adjust Makefiles and tests to new NSS directory layout, r=wtc (Previous changeset with identical description was accidentally empty.)
Makefile
cmd/Makefile
cmd/addbuiltin/manifest.mn
cmd/atob/manifest.mn
cmd/bltest/manifest.mn
cmd/btoa/manifest.mn
cmd/certcgi/manifest.mn
cmd/certutil/manifest.mn
cmd/checkcert/manifest.mn
cmd/chktest/manifest.mn
cmd/crlutil/manifest.mn
cmd/crmf-cgi/manifest.mn
cmd/crmftest/manifest.mn
cmd/dbck/manifest.mn
cmd/dbtest/manifest.mn
cmd/derdump/manifest.mn
cmd/digest/manifest.mn
cmd/ecperf/manifest.mn
cmd/fipstest/manifest.mn
cmd/httpserv/manifest.mn
cmd/lib/manifest.mn
cmd/libpkix/manifest.mn
cmd/listsuites/manifest.mn
cmd/lowhashtest/manifest.mn
cmd/makepqg/manifest.mn
cmd/manifest.mn
cmd/modutil/manifest.mn
cmd/multinit/manifest.mn
cmd/ocspclnt/manifest.mn
cmd/ocspresp/manifest.mn
cmd/oidcalc/manifest.mn
cmd/p7content/manifest.mn
cmd/p7env/manifest.mn
cmd/p7sign/manifest.mn
cmd/p7verify/manifest.mn
cmd/pk11mode/manifest.mn
cmd/pk11util/manifest.mn
cmd/pk12util/manifest.mn
cmd/pk1sign/manifest.mn
cmd/pkix-errcodes/manifest.mn
cmd/pp/manifest.mn
cmd/ppcertdata/manifest.mn
cmd/pwdecrypt/manifest.mn
cmd/rsaperf/manifest.mn
cmd/rsapoptst/manifest.mn
cmd/sdrtest/manifest.mn
cmd/selfserv/manifest.mn
cmd/shlibsign/mangle/manifest.mn
cmd/shlibsign/manifest.mn
cmd/signtool/manifest.mn
cmd/signver/manifest.mn
cmd/smimetools/manifest.mn
cmd/ssltap/manifest.mn
cmd/strsclnt/manifest.mn
cmd/symkeyutil/manifest.mn
cmd/tests/manifest.mn
cmd/tstclnt/manifest.mn
cmd/vfychain/manifest.mn
cmd/vfyserv/manifest.mn
lib/Makefile
lib/base/manifest.mn
lib/certdb/manifest.mn
lib/certhigh/manifest.mn
lib/ckfw/builtins/manifest.mn
lib/ckfw/manifest.mn
lib/crmf/manifest.mn
lib/cryptohi/manifest.mn
lib/dbm/Makefile
lib/dbm/include/Makefile
lib/dbm/include/manifest.mn
lib/dbm/manifest.mn
lib/dbm/src/Makefile
lib/dbm/src/config.mk
lib/dbm/src/manifest.mn
lib/dbm/tests/Makefile
lib/dev/manifest.mn
lib/freebl/manifest.mn
lib/jar/manifest.mn
lib/libpkix/include/manifest.mn
lib/libpkix/manifest.mn
lib/libpkix/pkix/certsel/manifest.mn
lib/libpkix/pkix/checker/manifest.mn
lib/libpkix/pkix/crlsel/manifest.mn
lib/libpkix/pkix/manifest.mn
lib/libpkix/pkix/params/manifest.mn
lib/libpkix/pkix/results/manifest.mn
lib/libpkix/pkix/store/manifest.mn
lib/libpkix/pkix/top/manifest.mn
lib/libpkix/pkix/util/manifest.mn
lib/libpkix/pkix_pl_nss/manifest.mn
lib/libpkix/pkix_pl_nss/module/manifest.mn
lib/libpkix/pkix_pl_nss/pki/manifest.mn
lib/libpkix/pkix_pl_nss/system/manifest.mn
lib/manifest.mn
lib/nss/manifest.mn
lib/pk11wrap/manifest.mn
lib/pkcs12/manifest.mn
lib/pkcs7/manifest.mn
lib/pki/manifest.mn
lib/smime/manifest.mn
lib/softoken/legacydb/manifest.mn
lib/softoken/manifest.mn
lib/sqlite/manifest.mn
lib/ssl/manifest.mn
lib/sysinit/manifest.mn
lib/util/manifest.mn
lib/zlib/manifest.mn
manifest.mn
tests/common/Makefile
tests/common/init.sh
--- a/Makefile
+++ b/Makefile
@@ -39,28 +39,28 @@ include $(CORE_DEPTH)/coreconf/rules.mk
 #######################################################################
 
 
 
 #######################################################################
 # (7) Execute "local" rules. (OPTIONAL).                              #
 #######################################################################
 
-nss_build_all: build_coreconf build_nspr build_dbm all
+nss_build_all: build_coreconf build_nspr all
 
-nss_clean_all: clobber_coreconf clobber_nspr clobber_dbm clobber
+nss_clean_all: clobber_coreconf clobber_nspr clobber
 
 build_coreconf:
 	$(MAKE) -C $(CORE_DEPTH)/coreconf
 
 clobber_coreconf:
 	$(MAKE) -C $(CORE_DEPTH)/coreconf clobber
 
-NSPR_CONFIG_STATUS = $(CORE_DEPTH)/../nsprpub/$(OBJDIR_NAME)/config.status
-NSPR_CONFIGURE = $(CORE_DEPTH)/../nsprpub/configure
+NSPR_CONFIG_STATUS = $(CORE_DEPTH)/../nspr/$(OBJDIR_NAME)/config.status
+NSPR_CONFIGURE = $(CORE_DEPTH)/../nspr/configure
 
 #
 # Translate coreconf build options to NSPR configure options.
 #
 
 ifeq ($(OS_TARGET),Android)
 NSPR_CONFIGURE_OPTS += --with-android-ndk=$(ANDROID_NDK) --target=arm-linux-androideabi --with-android-version=$(OS_TARGET_RELEASE)
 endif
@@ -91,51 +91,41 @@ endif
 
 USEABSPATH="YES"
 ifeq (,$(filter-out WIN%,$(OS_TARGET)))
 ifeq (,$(findstring :,$(shell pwd)))
 USEABSPATH="NO"
 endif
 endif
 ifeq ($(USEABSPATH),"YES")
-NSPR_PREFIX = $(shell pwd)/../../dist/$(OBJDIR_NAME)
+NSPR_PREFIX = $(shell pwd)/../dist/$(OBJDIR_NAME)
 else
 NSPR_PREFIX = $$(topsrcdir)/../dist/$(OBJDIR_NAME)
 endif
 
 $(NSPR_CONFIG_STATUS): $(NSPR_CONFIGURE)
-	$(NSINSTALL) -D $(CORE_DEPTH)/../nsprpub/$(OBJDIR_NAME)
-	cd $(CORE_DEPTH)/../nsprpub/$(OBJDIR_NAME) ; \
+	$(NSINSTALL) -D $(CORE_DEPTH)/../nspr/$(OBJDIR_NAME)
+	cd $(CORE_DEPTH)/../nspr/$(OBJDIR_NAME) ; \
 	$(NSPR_COMPILERS) sh ../configure \
 	$(NSPR_CONFIGURE_OPTS) \
 	--with-dist-prefix='$(NSPR_PREFIX)' \
 	--with-dist-includedir='$(NSPR_PREFIX)/include'
 
 build_nspr: $(NSPR_CONFIG_STATUS)
-	$(MAKE) -C $(CORE_DEPTH)/../nsprpub/$(OBJDIR_NAME)
+	$(MAKE) -C $(CORE_DEPTH)/../nspr/$(OBJDIR_NAME)
 
 clobber_nspr: $(NSPR_CONFIG_STATUS)
-	$(MAKE) -C $(CORE_DEPTH)/../nsprpub/$(OBJDIR_NAME) clobber
-
-build_dbm:
-ifdef NSS_DISABLE_DBM
-	@echo "skipping the build of DBM"
-else
-	$(MAKE) -C $(CORE_DEPTH)/dbm export libs
-endif
+	$(MAKE) -C $(CORE_DEPTH)/../nspr/$(OBJDIR_NAME) clobber
 
 build_docs:
 	$(MAKE) -C $(CORE_DEPTH)/nss/doc
 
 clean_docs:
 	$(MAKE) -C $(CORE_DEPTH)/nss/doc clean
 
-clobber_dbm:
-	$(MAKE) -C $(CORE_DEPTH)/dbm clobber
-
 moz_import::
 ifeq (,$(filter-out WIN%,$(OS_TARGET)))
 	$(NSINSTALL) -D $(DIST)/include/nspr
 	cp $(DIST)/../include/nspr/*.h $(DIST)/include/nspr
 	cp $(DIST)/../include/* $(DIST)/include
 ifdef BUILD_OPT
 	cp $(DIST)/../WIN32_O.OBJ/lib/* $(DIST)/lib
 else
@@ -149,13 +139,13 @@ ifeq ($(OS_TARGET),OS2)
 	cp -f $(DIST)/lib/libmozdbm_s.$(LIB_SUFFIX) $(DIST)/lib/libdbm.$(LIB_SUFFIX)
 else
 	$(NSINSTALL) -L ../../dist include $(DIST)
 	$(NSINSTALL) -L ../../dist lib $(DIST)
 	cp $(DIST)/lib/libmozdbm_s.$(LIB_SUFFIX) $(DIST)/lib/libdbm.$(LIB_SUFFIX)
 endif
 endif
 
-nss_RelEng_bld: build_coreconf import build_dbm all
+nss_RelEng_bld: build_coreconf import all
 
 package:
 	$(MAKE) -C pkg publish
 
--- a/cmd/Makefile
+++ b/cmd/Makefile
@@ -1,16 +1,16 @@
 #! gmake
 # 
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-CORE_DEPTH = ../..
-DEPTH = ../..
+CORE_DEPTH = ..
+DEPTH = ..
 
 include manifest.mn
 include $(CORE_DEPTH)/coreconf/config.mk
 
 ifdef BUILD_LIBPKIX_TESTS
 DIRS += libpkix
 endif
 
--- a/cmd/addbuiltin/manifest.mn
+++ b/cmd/addbuiltin/manifest.mn
@@ -1,14 +1,14 @@
 # 
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-CORE_DEPTH = ../../..
+CORE_DEPTH = ../..
 
 # MODULE public and private header  directories are implicitly REQUIRED.
 MODULE = nss 
 
 CSRCS = \
 	addbuiltin.c \
 	$(NULL)
 
--- a/cmd/atob/manifest.mn
+++ b/cmd/atob/manifest.mn
@@ -1,14 +1,14 @@
 # 
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-CORE_DEPTH	= ../../..
+CORE_DEPTH	= ../..
 
 # MODULE public and private header  directories are implicitly REQUIRED.
 MODULE = nss 
 
 # This next line is used by .mk files
 # and gets translated into $LINCS in manifest.mnw
 # The MODULE is always implicitly required.
 # Listing it here in REQUIRES makes it appear twice in the cc command line.
--- a/cmd/bltest/manifest.mn
+++ b/cmd/bltest/manifest.mn
@@ -1,13 +1,13 @@
 # 
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
-CORE_DEPTH = ../../..
+CORE_DEPTH = ../..
 
 MODULE = nss
 
 REQUIRES = seccmd dbm softoken
 
 INCLUDES += -I$(CORE_DEPTH)/nss/lib/softoken
 
 PROGRAM = bltest
--- a/cmd/btoa/manifest.mn
+++ b/cmd/btoa/manifest.mn
@@ -1,14 +1,14 @@
 # 
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-CORE_DEPTH	= ../../..
+CORE_DEPTH	= ../..
 
 # MODULE public and private header directories are implicitly REQUIRED.
 MODULE = nss 
 
 # This next line is used by .mk files
 # and gets translated into $LINCS in manifest.mnw
 # MODULE is implicitly REQUIRED, doesn't need to be listed below.
 REQUIRES = seccmd dbm 
--- a/cmd/certcgi/manifest.mn
+++ b/cmd/certcgi/manifest.mn
@@ -1,14 +1,14 @@
 # 
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-CORE_DEPTH	= ../../..
+CORE_DEPTH	= ../..
 
 # MODULE public and private header directories are implicitly REQUIREd.
 MODULE = nss 
 
 # This next line is used by .mk files
 # and gets translated into $LINCS in manifest.mnw
 REQUIRES = seccmd dbm 
 
--- a/cmd/certutil/manifest.mn
+++ b/cmd/certutil/manifest.mn
@@ -1,14 +1,14 @@
 # 
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-CORE_DEPTH = ../../..
+CORE_DEPTH = ../..
 
 DEFINES += -DNSPR20
 
 # MODULE public and private header  directories are implicitly REQUIRED.
 MODULE = nss 
 
 CSRCS = \
 	certext.c \
--- a/cmd/checkcert/manifest.mn
+++ b/cmd/checkcert/manifest.mn
@@ -1,14 +1,14 @@
 # 
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-CORE_DEPTH	= ../../..
+CORE_DEPTH	= ../..
 
 # MODULE public and private header  directories are implicitly REQUIRED.
 MODULE = nss 
 
 # This next line is used by .mk files
 # and gets translated into $LINCS in manifest.mnw
 REQUIRES = seccmd dbm 
 
--- a/cmd/chktest/manifest.mn
+++ b/cmd/chktest/manifest.mn
@@ -1,13 +1,13 @@
 # 
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
-CORE_DEPTH = ../../..
+CORE_DEPTH = ../..
 
 MODULE = nss
 
 #REQUIRES = seccmd dbm softoken
 REQUIRES = seccmd dbm
 
 #INCLUDES += -I$(CORE_DEPTH)/nss/lib/softoken
 
--- a/cmd/crlutil/manifest.mn
+++ b/cmd/crlutil/manifest.mn
@@ -1,14 +1,14 @@
 # 
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-CORE_DEPTH	= ../../..
+CORE_DEPTH	= ../..
 
 # MODULE public and private header  directories are implicitly REQUIRED.
 MODULE = nss 
 
 # This next line is used by .mk files
 # and gets translated into $LINCS in manifest.mnw
 # The MODULE is always implicitly required.
 # Listing it here in REQUIRES makes it appear twice in the cc command line.
--- a/cmd/crmf-cgi/manifest.mn
+++ b/cmd/crmf-cgi/manifest.mn
@@ -1,14 +1,14 @@
 # 
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-CORE_DEPTH = ../../..
+CORE_DEPTH = ../..
 MODULE	= sectools
 
 EXPORTS = \
 	$(NULL)
 
 CSRCS = \
 	crmfcgi.c \
 	$(NULL)
--- a/cmd/crmftest/manifest.mn
+++ b/cmd/crmftest/manifest.mn
@@ -1,14 +1,14 @@
 # 
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-CORE_DEPTH = ../../..
+CORE_DEPTH = ../..
 DEPTH      = .
 
 # MODULE public and private header  directories are implicitly REQUIRED.
 MODULE	= nss
 
 EXPORTS = \
 	$(NULL)
 
--- a/cmd/dbck/manifest.mn
+++ b/cmd/dbck/manifest.mn
@@ -1,14 +1,14 @@
 # 
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-CORE_DEPTH = ../../..
+CORE_DEPTH = ../..
 
 DEFINES += -DNSPR20 
 
 # MODULE public and private header  directories are implicitly REQUIRED.
 MODULE = nss 
 
 CSRCS = \
 	dbck.c \
--- a/cmd/dbtest/manifest.mn
+++ b/cmd/dbtest/manifest.mn
@@ -1,14 +1,14 @@
 # 
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-CORE_DEPTH = ../../..
+CORE_DEPTH = ../..
 
 # MODULE public and private header  directories are implicitly REQUIRED.
 MODULE = nss
 
 # This next line is used by .mk files
 # and gets translated into $LINCS in manifest.mnw
 # The MODULE is always implicitly required.
 # Listing it here in REQUIRES makes it appear twice in the cc command line.
--- a/cmd/derdump/manifest.mn
+++ b/cmd/derdump/manifest.mn
@@ -1,14 +1,14 @@
 # 
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-CORE_DEPTH	= ../../..
+CORE_DEPTH	= ../..
 
 # MODULE public and private header  directories are implicitly REQUIRED.
 MODULE = nss 
 
 # This next line is used by .mk files
 # and gets translated into $LINCS in manifest.mnw
 # The MODULE is always implicitly required.
 # Listing it here in REQUIRES makes it appear twice in the cc command line.
--- a/cmd/digest/manifest.mn
+++ b/cmd/digest/manifest.mn
@@ -1,14 +1,14 @@
 # 
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-CORE_DEPTH	= ../../..
+CORE_DEPTH	= ../..
 
 # MODULE public and private header  directories are implicitly REQUIRED.
 MODULE = nss 
 
 # This next line is used by .mk files
 # and gets translated into $LINCS in manifest.mnw
 # The MODULE is always implicitly required.
 # Listing it here in REQUIRES makes it appear twice in the cc command line.
--- a/cmd/ecperf/manifest.mn
+++ b/cmd/ecperf/manifest.mn
@@ -1,15 +1,15 @@
 # 
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH	= ../../..
-CORE_DEPTH = ../../..
+DEPTH	= ../..
+CORE_DEPTH = ../..
 
 # MODULE public and private header  directories are implicitly REQUIRED.
 MODULE = nss
 
 INCLUDES += -I$(CORE_DEPTH)/nss/lib/softoken
 
 # This next line is used by .mk files
 # and gets translated into $LINCS in manifest.mnw
--- a/cmd/fipstest/manifest.mn
+++ b/cmd/fipstest/manifest.mn
@@ -1,14 +1,14 @@
 # 
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-CORE_DEPTH = ../../..
+CORE_DEPTH = ../..
 
 MODULE = nss
 
 PROGRAM = fipstest
 
 USE_STATIC_LIBS = 1
 
 EXPORTS = \
--- a/cmd/httpserv/manifest.mn
+++ b/cmd/httpserv/manifest.mn
@@ -1,14 +1,14 @@
 # 
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-CORE_DEPTH = ../../..
+CORE_DEPTH = ../..
 
 DEFINES += -DNSPR20
 
 # MODULE public and private header  directories are implicitly REQUIRED.
 MODULE = nss
 
 CSRCS = httpserv.c
 
--- a/cmd/lib/manifest.mn
+++ b/cmd/lib/manifest.mn
@@ -1,13 +1,13 @@
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
-CORE_DEPTH	= ../../..
+CORE_DEPTH	= ../..
 
 LIBRARY_NAME	= sectool
 
 # MODULE public and private header  directories are implicitly REQUIRED.
 MODULE		= nss
 
 DEFINES		= -DNSPR20
 
--- a/cmd/libpkix/manifest.mn
+++ b/cmd/libpkix/manifest.mn
@@ -1,11 +1,11 @@
 # 
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 PKIX_DEPTH = .
 PLAT_DEPTH = $(PKIX_DEPTH)/..
-CORE_DEPTH = $(PKIX_DEPTH)/../../..
+CORE_DEPTH = $(PKIX_DEPTH)/../..
 
 DIRS =  testutil  pkix_pl  pkix  sample_apps  perf  pkixutil \
 	$(NULL)
--- a/cmd/listsuites/manifest.mn
+++ b/cmd/listsuites/manifest.mn
@@ -1,14 +1,14 @@
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-CORE_DEPTH = ../../..
+CORE_DEPTH = ../..
 
 MODULE = nss
 
 CSRCS = listsuites.c  
 
 REQUIRES = seccmd 
 
 PROGRAM = listsuites
--- a/cmd/lowhashtest/manifest.mn
+++ b/cmd/lowhashtest/manifest.mn
@@ -1,13 +1,13 @@
 # 
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
-CORE_DEPTH = ../../..
+CORE_DEPTH = ../..
 
 MODULE = nss
 
 REQUIRES = seccmd dbm softoken
 
 INCLUDES += -I$(CORE_DEPTH)/nss/lib/freebl
 
 PROGRAM = lowhashtest
--- a/cmd/makepqg/manifest.mn
+++ b/cmd/makepqg/manifest.mn
@@ -1,14 +1,14 @@
 # 
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-CORE_DEPTH = ../../..
+CORE_DEPTH = ../..
 
 MODULE = nss
 
 REQUIRES = dbm 
 
 # DIRS = 
 
 CSRCS	=  makepqg.c
--- a/cmd/manifest.mn
+++ b/cmd/manifest.mn
@@ -1,14 +1,14 @@
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH	= ../..
+DEPTH	= ..
 # MODULE	= seccmd
 
 REQUIRES = nss nspr libdbm
 
 DIRS = lib  \
  addbuiltin \
  atob  \
  bltest \
--- a/cmd/modutil/manifest.mn
+++ b/cmd/modutil/manifest.mn
@@ -1,14 +1,14 @@
 # 
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-CORE_DEPTH = ../../..
+CORE_DEPTH = ../..
 
 MODULE = sectools
 
 EXPORTS = 
 
 CSRCS = modutil.c		\
 		pk11.c			\
 		instsec.c		\
--- a/cmd/multinit/manifest.mn
+++ b/cmd/multinit/manifest.mn
@@ -1,13 +1,13 @@
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-CORE_DEPTH	= ../../..
+CORE_DEPTH	= ../..
 
 # MODULE public and private header  directories are implicitly REQUIRED.
 MODULE = nss 
 
 CSRCS = multinit.c
 
 PROGRAM	= multinit
--- a/cmd/ocspclnt/manifest.mn
+++ b/cmd/ocspclnt/manifest.mn
@@ -1,14 +1,14 @@
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-CORE_DEPTH = ../../..
+CORE_DEPTH = ../..
 
 # MODULE public and private header  directories are implicitly REQUIRED.
 MODULE = nss
 
 CSRCS = \
 	ocspclnt.c \
 	$(NULL)
 
--- a/cmd/ocspresp/manifest.mn
+++ b/cmd/ocspresp/manifest.mn
@@ -1,14 +1,14 @@
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-CORE_DEPTH = ../../..
+CORE_DEPTH = ../..
 
 MODULE = nss
 
 CSRCS = ocspresp.c
 
 REQUIRES = seccmd 
 
 PROGRAM = ocspresp
--- a/cmd/oidcalc/manifest.mn
+++ b/cmd/oidcalc/manifest.mn
@@ -1,14 +1,14 @@
 # 
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-CORE_DEPTH	= ../../..
+CORE_DEPTH	= ../..
 
 # MODULE public and private header  directories are implicitly REQUIRED.
 MODULE = nss 
 
 # This next line is used by .mk files
 # and gets translated into $LINCS in manifest.mnw
 REQUIRES = seccmd dbm 
 
--- a/cmd/p7content/manifest.mn
+++ b/cmd/p7content/manifest.mn
@@ -1,14 +1,14 @@
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-CORE_DEPTH	= ../../..
+CORE_DEPTH	= ../..
 
 MODULE = nss
 
 CSRCS = p7content.c
 
 REQUIRES = seccmd 
 
 PROGRAM = p7content
--- a/cmd/p7env/manifest.mn
+++ b/cmd/p7env/manifest.mn
@@ -1,14 +1,14 @@
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-CORE_DEPTH = ../../..
+CORE_DEPTH = ../..
 
 MODULE = nss
 
 CSRCS = p7env.c  
 
 REQUIRES = seccmd 
 
 PROGRAM = p7env
--- a/cmd/p7sign/manifest.mn
+++ b/cmd/p7sign/manifest.mn
@@ -1,14 +1,14 @@
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-CORE_DEPTH = ../../..
+CORE_DEPTH = ../..
 
 MODULE = nss
 
 CSRCS = p7sign.c  
 
 REQUIRES = seccmd 
 
 PROGRAM = p7sign
--- a/cmd/p7verify/manifest.mn
+++ b/cmd/p7verify/manifest.mn
@@ -1,14 +1,14 @@
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-CORE_DEPTH = ../../..
+CORE_DEPTH = ../..
 
 MODULE = nss
 
 CSRCS = p7verify.c  
 
 REQUIRES = seccmd 
 
 PROGRAM = p7verify
--- a/cmd/pk11mode/manifest.mn
+++ b/cmd/pk11mode/manifest.mn
@@ -1,14 +1,14 @@
 # 
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-CORE_DEPTH = ../../..
+CORE_DEPTH = ../..
 
 MODULE = nss
 
 EXPORTS =
 
 CSRCS = pk11mode.c
 
 PROGRAM = pk11mode
--- a/cmd/pk11util/manifest.mn
+++ b/cmd/pk11util/manifest.mn
@@ -1,14 +1,14 @@
 # 
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-CORE_DEPTH = ../../..
+CORE_DEPTH = ../..
 
 DEFINES += -DNSPR20
 
 # MODULE public and private header  directories are implicitly REQUIRED.
 MODULE = nss 
 
 CSRCS = pk11util.c
 #CSRCS = symkeytest.c 
--- a/cmd/pk12util/manifest.mn
+++ b/cmd/pk12util/manifest.mn
@@ -1,14 +1,14 @@
 # 
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-CORE_DEPTH = ../../..
+CORE_DEPTH = ../..
 
 DEFINES += -DNSPR20
 
 # MODULE public and private header  directories are implicitly REQUIRED.
 MODULE = nss 
 
 CSRCS = \
 	pk12util.c \
--- a/cmd/pk1sign/manifest.mn
+++ b/cmd/pk1sign/manifest.mn
@@ -1,14 +1,14 @@
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-CORE_DEPTH = ../../..
+CORE_DEPTH = ../..
 
 MODULE = nss
 
 CSRCS = pk1sign.c  
 
 REQUIRES = seccmd 
 
 PROGRAM = pk1sign
--- a/cmd/pkix-errcodes/manifest.mn
+++ b/cmd/pkix-errcodes/manifest.mn
@@ -1,14 +1,14 @@
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-CORE_DEPTH = ../../..
+CORE_DEPTH = ../..
 
 MODULE = nss
 
 CSRCS = pkix-errcodes.c  
 
 REQUIRES = seccmd 
 
 PROGRAM = pkix-errcodes
--- a/cmd/pp/manifest.mn
+++ b/cmd/pp/manifest.mn
@@ -1,14 +1,14 @@
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-CORE_DEPTH	= ../../..
+CORE_DEPTH	= ../..
 
 # MODULE public and private header  directories are implicitly REQUIRED.
 MODULE = nss 
 
 # This next line is used by .mk files
 # and gets translated into $LINCS in manifest.mnw
 REQUIRES = seccmd dbm 
 
--- a/cmd/ppcertdata/manifest.mn
+++ b/cmd/ppcertdata/manifest.mn
@@ -1,14 +1,14 @@
 # 
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-CORE_DEPTH	= ../../..
+CORE_DEPTH	= ../..
 
 # MODULE public and private header  directories are implicitly REQUIRED.
 MODULE = nss 
 
 # This next line is used by .mk files
 # and gets translated into $LINCS in manifest.mnw
 # The MODULE is always implicitly required.
 # Listing it here in REQUIRES makes it appear twice in the cc command line.
--- a/cmd/pwdecrypt/manifest.mn
+++ b/cmd/pwdecrypt/manifest.mn
@@ -1,14 +1,14 @@
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-CORE_DEPTH = ../../..
+CORE_DEPTH = ../..
 
 # MODULE public and private header  directories are implicitly REQUIRED.
 MODULE = nss
 
 CSRCS = \
 	pwdecrypt.c \
 	$(NULL)
 
--- a/cmd/rsaperf/manifest.mn
+++ b/cmd/rsaperf/manifest.mn
@@ -1,15 +1,15 @@
 # 
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DEPTH	= ../../..
-CORE_DEPTH = ../../..
+DEPTH	= ../..
+CORE_DEPTH = ../..
 
 # MODULE public and private header  directories are implicitly REQUIRED.
 MODULE = nss
 
 INCLUDES += -I$(CORE_DEPTH)/nss/lib/softoken
 
 # This next line is used by .mk files
 # and gets translated into $LINCS in manifest.mnw
--- a/cmd/rsapoptst/manifest.mn
+++ b/cmd/rsapoptst/manifest.mn
@@ -1,13 +1,13 @@
 # 
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
-CORE_DEPTH = ../../..
+CORE_DEPTH = ../..
 
 MODULE = nss
 
 REQUIRES = seccmd dbm softoken
 
 PROGRAM = rsapoptst
 
 EXPORTS = \
--- a/cmd/sdrtest/manifest.mn
+++ b/cmd/sdrtest/manifest.mn
@@ -1,14 +1,14 @@
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-CORE_DEPTH = ../../..
+CORE_DEPTH = ../..
 
 # MODULE public and private header  directories are implicitly REQUIRED.
 MODULE = nss
 
 CSRCS = \
 	sdrtest.c \
 	$(NULL)
 
--- a/cmd/selfserv/manifest.mn
+++ b/cmd/selfserv/manifest.mn
@@ -1,14 +1,14 @@
 # 
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-CORE_DEPTH = ../../..
+CORE_DEPTH = ../..
 
 DEFINES += -DNSPR20
 
 # MODULE public and private header  directories are implicitly REQUIRED.
 MODULE = nss
 
 CSRCS = selfserv.c
 
--- a/cmd/shlibsign/mangle/manifest.mn
+++ b/cmd/shlibsign/mangle/manifest.mn
@@ -1,14 +1,14 @@
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-CORE_DEPTH = ../../../..
+CORE_DEPTH = ../../..
 
 # MODULE public and private header  directories are implicitly REQUIRED.
 MODULE = nss
 
 DEFINES += -DSHLIB_SUFFIX=\"$(DLL_SUFFIX)\" -DSHLIB_PREFIX=\"$(DLL_PREFIX)\"
 
 CSRCS = \
 	mangle.c \
--- a/cmd/shlibsign/manifest.mn
+++ b/cmd/shlibsign/manifest.mn
@@ -1,14 +1,14 @@
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-CORE_DEPTH = ../../..
+CORE_DEPTH = ../..
 
 # MODULE public and private header  directories are implicitly REQUIRED.
 MODULE = nss
 
 DEFINES += -DSHLIB_SUFFIX=\"$(DLL_SUFFIX)\" -DSHLIB_PREFIX=\"$(DLL_PREFIX)\"
 
 CSRCS = \
 	shlibsign.c \
--- a/cmd/signtool/manifest.mn
+++ b/cmd/signtool/manifest.mn
@@ -1,13 +1,13 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-CORE_DEPTH = ../../..
+CORE_DEPTH = ../..
 
 MODULE = nss
 
 EXPORTS = 
 
 CSRCS = signtool.c		\
 		certgen.c	\
 		javascript.c	\
--- a/cmd/signver/manifest.mn
+++ b/cmd/signver/manifest.mn
@@ -1,13 +1,13 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-CORE_DEPTH = ../../..
+CORE_DEPTH = ../..
 
 MODULE = nss
 
 CSRCS = signver.c	\
         pk7print.c	\
 	$(NULL)
 
 REQUIRES = dbm seccmd
--- a/cmd/smimetools/manifest.mn
+++ b/cmd/smimetools/manifest.mn
@@ -1,14 +1,14 @@
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-CORE_DEPTH = ../../..
+CORE_DEPTH = ../..
 
 MODULE = nss
 
 CSRCS = cmsutil.c  
 
 MYLIB = $(DIST)/lib/libsmime.a
 
 REQUIRES = seccmd dbm
--- a/cmd/ssltap/manifest.mn
+++ b/cmd/ssltap/manifest.mn
@@ -1,14 +1,14 @@
 # 
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-CORE_DEPTH = ../../..
+CORE_DEPTH = ../..
 
 # MODULE public and private header  directories are implicitly REQUIRED.
 MODULE = nss
 
 EXPORTS = 
 
 CSRCS = ssltap.c	\
 	$(NULL)
--- a/cmd/strsclnt/manifest.mn
+++ b/cmd/strsclnt/manifest.mn
@@ -1,13 +1,13 @@
 # 
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
-CORE_DEPTH = ../../..
+CORE_DEPTH = ../..
 
 DEFINES += -DNSPR20
 
 # MODULE public and private header  directories are implicitly REQUIRED.
 MODULE = nss
 
 CSRCS = strsclnt.c
 
--- a/cmd/symkeyutil/manifest.mn
+++ b/cmd/symkeyutil/manifest.mn
@@ -1,14 +1,14 @@
 # 
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-CORE_DEPTH = ../../..
+CORE_DEPTH = ../..
 
 DEFINES += -DNSPR20
 
 # MODULE public and private header  directories are implicitly REQUIRED.
 MODULE = nss 
 
 CSRCS = symkeyutil.c 
 #CSRCS = symkeytest.c 
--- a/cmd/tests/manifest.mn
+++ b/cmd/tests/manifest.mn
@@ -1,14 +1,14 @@
 # 
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-CORE_DEPTH = ../../..
+CORE_DEPTH = ../..
 
 # MODULE public and private header  directories are implicitly REQUIRED.
 MODULE = nss
 
 CSRCS = \
 	baddbdir.c \
 	conflict.c \
 	dertimetest.c \
--- a/cmd/tstclnt/manifest.mn
+++ b/cmd/tstclnt/manifest.mn
@@ -1,14 +1,14 @@
 # 
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-CORE_DEPTH = ../../..
+CORE_DEPTH = ../..
 
 # MODULE public and private header  directories are implicitly REQUIRED.
 MODULE = nss
 
 # This next line is used by .mk files
 # and gets translated into $LINCS in manifest.mnw
 # The MODULE is always implicitly required.
 # Listing it here in REQUIRES makes it appear twice in the cc command line.
--- a/cmd/vfychain/manifest.mn
+++ b/cmd/vfychain/manifest.mn
@@ -1,14 +1,14 @@
 # 
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-CORE_DEPTH = ../../..
+CORE_DEPTH = ../..
 
 # MODULE public and private header  directories are implicitly REQUIRED.
 MODULE = nss
 
 # This next line is used by .mk files
 # and gets translated into $LINCS in manifest.mnw
 # The MODULE is always implicitly required.
 # Listing it here in REQUIRES makes it appear twice in the cc command line.
--- a/cmd/vfyserv/manifest.mn
+++ b/cmd/vfyserv/manifest.mn
@@ -1,14 +1,14 @@
 # 
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-CORE_DEPTH = ../../..
+CORE_DEPTH = ../..
 
 # MODULE public and private header  directories are implicitly REQUIRED.
 MODULE = nss
 
 # This next line is used by .mk files
 # and gets translated into $LINCS in manifest.mnw
 # The MODULE is always implicitly required.
 # Listing it here in REQUIRES makes it appear twice in the cc command line.
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -37,16 +37,20 @@ endif
 endif
 
 ifndef MOZILLA_CLIENT
 ifeq ($(OS_ARCH),Linux)
 SYSINIT_SRCDIR = sysinit  # Add the sysinit directory to DIRS.
 endif
 endif
 
+ifndef NSS_DISABLE_DBM
+DBM_SRCDIR = dbm  # Add the dbm directory to DIRS.
+endif
+
 #######################################################################
 # (5) Execute "global" rules. (OPTIONAL)                              #
 #######################################################################
 
 include $(CORE_DEPTH)/coreconf/rules.mk
 
 #######################################################################
 # (6) Execute "component" rules. (OPTIONAL)                           #
--- a/lib/base/manifest.mn
+++ b/lib/base/manifest.mn
@@ -1,15 +1,15 @@
 # 
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 MANIFEST_CVS_ID = "@(#) $RCSfile$ $Revision$ $Date$"
 
-CORE_DEPTH = ../../..
+CORE_DEPTH = ../..
 
 PRIVATE_EXPORTS = \
 	baset.h		  \
 	base.h		  \
 	$(NULL)
 
 EXPORTS =	   \
 	nssbaset.h \
--- a/lib/certdb/manifest.mn
+++ b/lib/certdb/manifest.mn
@@ -1,13 +1,13 @@
 # 
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
-CORE_DEPTH = ../../..
+CORE_DEPTH = ../..
 
 EXPORTS = \
 	cert.h \
 	certt.h \
 	certdb.h \
 	$(NULL)
 
 PRIVATE_EXPORTS = \
--- a/lib/certhigh/manifest.mn
+++ b/lib/certhigh/manifest.mn
@@ -1,13 +1,13 @@
 # 
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
-CORE_DEPTH = ../../..
+CORE_DEPTH = ../..
 
 EXPORTS = \
 	ocsp.h \
 	ocspt.h \
 	$(NULL)
 
 PRIVATE_EXPORTS = \
 	ocspti.h \
--- a/lib/ckfw/builtins/manifest.mn
+++ b/lib/ckfw/builtins/manifest.mn
@@ -1,15 +1,15 @@
 # 
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 MANIFEST_CVS_ID = "@(#) $RCSfile$ $Revision$ $Date$"
 
-CORE_DEPTH = ../../../..
+CORE_DEPTH = ../../..
 
 MODULE = nss
 MAPFILE = $(OBJDIR)/nssckbi.def
 
 EXPORTS =		\
 	nssckbi.h	\
 	$(NULL)
 
--- a/lib/ckfw/manifest.mn
+++ b/lib/ckfw/manifest.mn
@@ -1,15 +1,15 @@
 # 
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 MANIFEST_CVS_ID = "@(#) $RCSfile$ $Revision$ $Date$"
 
-CORE_DEPTH = ../../..
+CORE_DEPTH = ../..
 
 DIRS = builtins 
 
 PRIVATE_EXPORTS = \
 	ck.h		  \
 	ckfw.h		  \
 	ckfwm.h		  \
 	ckfwtm.h	  \
--- a/lib/crmf/manifest.mn
+++ b/lib/crmf/manifest.mn
@@ -1,14 +1,14 @@
 # 
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-CORE_DEPTH = ../../..
+CORE_DEPTH = ../..
 
 MODULE = nss
 
 EXPORTS = \
 	crmf.h	\
 	crmft.h	\
 	cmmf.h  \
 	cmmft.h \
--- a/lib/cryptohi/manifest.mn
+++ b/lib/cryptohi/manifest.mn
@@ -1,13 +1,13 @@
 # 
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
-CORE_DEPTH = ../../..
+CORE_DEPTH = ../..
 
 MODULE = nss
 
 LIBRARY_NAME = cryptohi
 
 EXPORTS = \
 	cryptohi.h \
 	cryptoht.h \
--- a/lib/dbm/Makefile
+++ b/lib/dbm/Makefile
@@ -5,20 +5,16 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 #######################################################################
 # (1) Include initial platform-independent assignments (MANDATORY).   #
 #######################################################################
 
 include manifest.mn
 
-ifdef NSS_DISABLE_DBM
-DIRS =
-endif
-
 #######################################################################
 # (2) Include "global" configuration information. (OPTIONAL)          #
 #######################################################################
 
 include $(CORE_DEPTH)/coreconf/config.mk
 
 #######################################################################
 # (3) Include "component" configuration information. (OPTIONAL)       #
--- a/lib/dbm/include/Makefile
+++ b/lib/dbm/include/Makefile
@@ -39,10 +39,9 @@ include $(CORE_DEPTH)/coreconf/rules.mk
 #######################################################################
 
 
 
 #######################################################################
 # (7) Execute "local" rules. (OPTIONAL).                              #
 #######################################################################
 
-
-
+export:: private_export
--- a/lib/dbm/include/manifest.mn
+++ b/lib/dbm/include/manifest.mn
@@ -1,17 +1,15 @@
 #! gmake
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-CORE_DEPTH = ../..
-
-VPATH  = $(CORE_DEPTH)/../dbm/include
+CORE_DEPTH = ../../..
 
 MODULE = dbm
 
 EXPORTS =	cdefs.h   \
 		mcom_db.h \
 		ncompat.h \
 		winfile.h \
 		$(NULL)
--- a/lib/dbm/manifest.mn
+++ b/lib/dbm/manifest.mn
@@ -1,15 +1,15 @@
 #! gmake
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-CORE_DEPTH = ..
+CORE_DEPTH = ../..
 
 MODULE = dbm
 
 IMPORTS = nspr20/v4.4.1
 
 RELEASE = dbm
 
 DIRS =  include \
--- a/lib/dbm/src/Makefile
+++ b/lib/dbm/src/Makefile
@@ -15,17 +15,17 @@ include manifest.mn
 #######################################################################
 
 include $(CORE_DEPTH)/coreconf/config.mk
 
 #######################################################################
 # (3) Include "component" configuration information. (OPTIONAL)       #
 #######################################################################
 
-include $(CORE_DEPTH)/dbm/config/config.mk
+include $(CORE_DEPTH)/lib/dbm/config/config.mk
 
 #######################################################################
 # (4) Include "local" platform-dependent assignments (OPTIONAL).      #
 #######################################################################
 
 include config.mk
 
 #######################################################################
--- a/lib/dbm/src/config.mk
+++ b/lib/dbm/src/config.mk
@@ -1,18 +1,16 @@
 #! gmake
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 DEFINES += -DMEMMOVE -D__DBINTERFACE_PRIVATE $(SECURITY_FLAG)
 
-INCLUDES += -I$(CORE_DEPTH)/../dbm/include
-
 #
 #  Currently, override TARGETS variable so that only static libraries
 #  are specifed as dependencies within rules.mk.
 #
 
 TARGETS        = $(LIBRARY)
 SHARED_LIBRARY =
 IMPORT_LIBRARY =
--- a/lib/dbm/src/manifest.mn
+++ b/lib/dbm/src/manifest.mn
@@ -1,17 +1,15 @@
 #! gmake
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-CORE_DEPTH = ../..
-
-VPATH  = $(CORE_DEPTH)/../dbm/src
+CORE_DEPTH = ../../..
 
 MODULE = dbm
 
 #
 # memmove.c, snprintf.c, and strerror.c are not in CSRCS because
 # the Standard C Library has memmove and strerror and DBM is not
 # using snprintf.
 #
--- a/lib/dbm/tests/Makefile
+++ b/lib/dbm/tests/Makefile
@@ -1,15 +1,15 @@
 #! gmake
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
-DEPTH		= ../..
-CORE_DEPTH	= ../..
+DEPTH		= ../../..
+CORE_DEPTH	= ../../..
 
 VPATH		= $(CORE_DEPTH)/../dbm/tests
 
 MODULE		= dbm
 
 CSRCS		= lots.c
 
 PROGRAM		= lots
--- a/lib/dev/manifest.mn
+++ b/lib/dev/manifest.mn
@@ -1,15 +1,15 @@
 # 
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 MANIFEST_CVS_ID = "@(#) $RCSfile$ $Revision$ $Date$"
 
-CORE_DEPTH = ../../..
+CORE_DEPTH = ../..
 
 PRIVATE_EXPORTS = \
 	ckhelper.h \
 	devm.h     \
 	devtm.h    \
 	devt.h     \
 	dev.h      \
 	nssdevt.h  \
--- a/lib/freebl/manifest.mn
+++ b/lib/freebl/manifest.mn
@@ -1,17 +1,17 @@
 # 
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 # NOTE: any ifdefs in this file must be defined on the gmake command line
 # (if anywhere).  They cannot come from Makefile or config.mk 
 
-CORE_DEPTH = ../../..
+CORE_DEPTH = ../..
 
 MODULE = nss
 
 LIBRARY_NAME = freebl
 LIBRARY_VERSION = 3
 
 ifdef FREEBL_CHILD_BUILD
   ifdef USE_ABI32_INT32
--- a/lib/jar/manifest.mn
+++ b/lib/jar/manifest.mn
@@ -1,17 +1,17 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 MODULE = nss
 
 LIBRARY_NAME = jar
 
-CORE_DEPTH = ../../..
+CORE_DEPTH = ../..
 
 CSRCS =	\
 	jarver.c \
 	jarsign.c \
 	jar.c \
 	jar-ds.c \
 	jarfile.c \
 	jarint.c \
--- a/lib/libpkix/include/manifest.mn
+++ b/lib/libpkix/include/manifest.mn
@@ -1,13 +1,13 @@
 # 
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
-CORE_DEPTH = ../../../..
+CORE_DEPTH = ../../..
 
 EXPORTS = \
 	$(NULL)
 
 PRIVATE_EXPORTS = \
 	pkix.h \
 	pkix_crlsel.h \
 	pkix_errorstrings.h \
--- a/lib/libpkix/manifest.mn
+++ b/lib/libpkix/manifest.mn
@@ -1,13 +1,13 @@
 # 
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
-CORE_DEPTH = ../../..
-DEPTH      = ../../..
+CORE_DEPTH = ../..
+DEPTH      = ../..
 
 #
 DIRS =  include pkix pkix_pl_nss \
 	$(NULL)
 
 # This part of the code, including all sub-dirs, can be optimized for size
 export ALLOW_OPT_CODE_SIZE = 1
--- a/lib/libpkix/pkix/certsel/manifest.mn
+++ b/lib/libpkix/pkix/certsel/manifest.mn
@@ -1,13 +1,13 @@
 # 
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
-CORE_DEPTH = ../../../../..
+CORE_DEPTH = ../../../..
 
 EXPORTS = \
 	$(NULL)
 
 PRIVATE_EXPORTS = \
 	pkix_certselector.h \
 	pkix_comcertselparams.h \
 	$(NULL)
--- a/lib/libpkix/pkix/checker/manifest.mn
+++ b/lib/libpkix/pkix/checker/manifest.mn
@@ -1,13 +1,13 @@
 # 
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
-CORE_DEPTH = ../../../../..
+CORE_DEPTH = ../../../..
 
 EXPORTS = \
 	$(NULL)
 
 PRIVATE_EXPORTS = \
 	pkix_basicconstraintschecker.h \
 	pkix_certchainchecker.h \
 	pkix_crlchecker.h \
--- a/lib/libpkix/pkix/crlsel/manifest.mn
+++ b/lib/libpkix/pkix/crlsel/manifest.mn
@@ -1,13 +1,13 @@
 # 
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
-CORE_DEPTH = ../../../../..
+CORE_DEPTH = ../../../..
 
 EXPORTS = \
 	$(NULL)
 
 PRIVATE_EXPORTS = \
 	pkix_comcrlselparams.h \
 	pkix_crlselector.h \
 	$(NULL)
--- a/lib/libpkix/pkix/manifest.mn
+++ b/lib/libpkix/pkix/manifest.mn
@@ -1,11 +1,11 @@
 # 
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
-CORE_DEPTH = ../../../..
-DEPTH      = ../../../..
+CORE_DEPTH = ../../..
+DEPTH      = ../../..
 
 #
 DIRS =  certsel crlsel checker params results store top util \
 	$(NULL)
 
--- a/lib/libpkix/pkix/params/manifest.mn
+++ b/lib/libpkix/pkix/params/manifest.mn
@@ -1,13 +1,13 @@
 # 
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
-CORE_DEPTH = ../../../../..
+CORE_DEPTH = ../../../..
 
 EXPORTS = \
 	$(NULL)
 
 PRIVATE_EXPORTS = \
 	pkix_procparams.h \
 	pkix_trustanchor.h \
 	pkix_valparams.h \
--- a/lib/libpkix/pkix/results/manifest.mn
+++ b/lib/libpkix/pkix/results/manifest.mn
@@ -1,13 +1,13 @@
 # 
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
-CORE_DEPTH = ../../../../..
+CORE_DEPTH = ../../../..
 
 EXPORTS = \
 	$(NULL)
 
 PRIVATE_EXPORTS = \
 	pkix_buildresult.h \
 	pkix_policynode.h \
 	pkix_valresult.h \
--- a/lib/libpkix/pkix/store/manifest.mn
+++ b/lib/libpkix/pkix/store/manifest.mn
@@ -1,13 +1,13 @@
 # 
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
-CORE_DEPTH = ../../../../..
+CORE_DEPTH = ../../../..
 
 EXPORTS = \
 	$(NULL)
 
 PRIVATE_EXPORTS = \
 	pkix_store.h \
 	$(NULL)
 
--- a/lib/libpkix/pkix/top/manifest.mn
+++ b/lib/libpkix/pkix/top/manifest.mn
@@ -1,13 +1,13 @@
 # 
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
-CORE_DEPTH = ../../../../..
+CORE_DEPTH = ../../../..
 
 EXPORTS = \
 	$(NULL)
 
 PRIVATE_EXPORTS = \
 	pkix_build.h \
 	pkix_lifecycle.h \
 	pkix_validate.h \
--- a/lib/libpkix/pkix/util/manifest.mn
+++ b/lib/libpkix/pkix/util/manifest.mn
@@ -1,13 +1,13 @@
 # 
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
-CORE_DEPTH = ../../../../..
+CORE_DEPTH = ../../../..
 
 EXPORTS = \
 	$(NULL)
 
 PRIVATE_EXPORTS = \
 	pkix_tools.h \
 	pkix_error.h \
 	pkix_logger.h \
--- a/lib/libpkix/pkix_pl_nss/manifest.mn
+++ b/lib/libpkix/pkix_pl_nss/manifest.mn
@@ -1,11 +1,11 @@
 # 
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
-CORE_DEPTH = ../../../..
-DEPTH      = ../../../..
+CORE_DEPTH = ../../..
+DEPTH      = ../../..
 
 #
 DIRS =  pki system module \
 	$(NULL)
 
--- a/lib/libpkix/pkix_pl_nss/module/manifest.mn
+++ b/lib/libpkix/pkix_pl_nss/module/manifest.mn
@@ -1,13 +1,13 @@
 # 
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
-CORE_DEPTH = ../../../../..
+CORE_DEPTH = ../../../..
 
 EXPORTS = \
 	$(NULL)
 
 PRIVATE_EXPORTS = \
 	pkix_pl_aiamgr.h \
 	pkix_pl_colcertstore.h \
 	pkix_pl_httpcertstore.h \
--- a/lib/libpkix/pkix_pl_nss/pki/manifest.mn
+++ b/lib/libpkix/pkix_pl_nss/pki/manifest.mn
@@ -1,13 +1,13 @@
 # 
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
-CORE_DEPTH = ../../../../..
+CORE_DEPTH = ../../../..
 
 EXPORTS = \
 	$(NULL)
 
 PRIVATE_EXPORTS = \
 	pkix_pl_basicconstraints.h \
 	pkix_pl_cert.h \
 	pkix_pl_certpolicyinfo.h \
--- a/lib/libpkix/pkix_pl_nss/system/manifest.mn
+++ b/lib/libpkix/pkix_pl_nss/system/manifest.mn
@@ -1,13 +1,13 @@
 # 
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
-CORE_DEPTH = ../../../../..
+CORE_DEPTH = ../../../..
 
 EXPORTS = \
 	$(NULL)
 
 PRIVATE_EXPORTS = \
 	pkix_pl_common.h \
 	pkix_pl_mem.h \
 	pkix_pl_object.h \
--- a/lib/manifest.mn
+++ b/lib/manifest.mn
@@ -1,27 +1,27 @@
 # 
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
-CORE_DEPTH = ../..
-DEPTH      = ../..
+CORE_DEPTH = ..
+DEPTH      = ..
 
 #
 # organized by DLL
 #
 #  softoken and prereqs.
 #  stan (not a separate dll yet)
 #  libpkix (not a separate dll)
 #  nss base (traditional)
 #  ssl
 #  smime
 #  ckfw (builtins module)
 #  crmf jar (not dll's)
-DIRS =  util freebl $(SQLITE_SRCDIR) softoken \
+DIRS =  util freebl $(SQLITE_SRCDIR) $(DBM_SRCDIR) softoken \
 	base dev pki \
 	libpkix \
 	certdb certhigh pk11wrap cryptohi nss \
 	$(ZLIB_SRCDIR) ssl \
 	pkcs12 pkcs7 smime \
 	crmf jar \
 	ckfw $(SYSINIT_SRCDIR) \
 	$(NULL)
--- a/lib/nss/manifest.mn
+++ b/lib/nss/manifest.mn
@@ -1,13 +1,13 @@
 # 
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
-CORE_DEPTH = ../../..
+CORE_DEPTH = ../..
 
 PRIVATE_EXPORTS = \
 	nssrenam.h \
 	$(NULL)
 
 EXPORTS = \
 	nss.h \
 	$(NULL)
--- a/lib/pk11wrap/manifest.mn
+++ b/lib/pk11wrap/manifest.mn
@@ -1,13 +1,13 @@
 # 
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
-CORE_DEPTH = ../../..
+CORE_DEPTH = ../..
 
 EXPORTS = \
 	secmod.h \
 	secmodt.h \
 	secpkcs5.h \
 	pk11func.h \
 	pk11pub.h \
 	pk11priv.h \
--- a/lib/pkcs12/manifest.mn
+++ b/lib/pkcs12/manifest.mn
@@ -1,14 +1,14 @@
 # 
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-CORE_DEPTH = ../../..
+CORE_DEPTH = ../..
 
 EXPORTS = \
 	pkcs12t.h \
 	pkcs12.h \
 	p12plcy.h \
 	p12.h \
 	p12t.h \
 	$(NULL)
--- a/lib/pkcs7/manifest.mn
+++ b/lib/pkcs7/manifest.mn
@@ -1,14 +1,14 @@
 # 
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-CORE_DEPTH = ../../..
+CORE_DEPTH = ../..
 
 EXPORTS = \
 	secmime.h \
 	secpkcs7.h \
 	pkcs7t.h \
 	$(NULL)
 
 PRIVATE_EXPORTS = \
--- a/lib/pki/manifest.mn
+++ b/lib/pki/manifest.mn
@@ -1,15 +1,15 @@
 # 
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 MANIFEST_CVS_ID = "@(#) $RCSfile$ $Revision$ $Date$"
 
-CORE_DEPTH = ../../..
+CORE_DEPTH = ../..
 
 PRIVATE_EXPORTS = \
 	pki.h      \
 	pkit.h     \
 	nsspkit.h  \
 	nsspki.h   \
 	pkistore.h \
 	pki3hack.h \
--- a/lib/smime/manifest.mn
+++ b/lib/smime/manifest.mn
@@ -1,14 +1,14 @@
 # 
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-CORE_DEPTH = ../../..
+CORE_DEPTH = ../..
 
 EXPORTS = \
 	cms.h \
 	cmst.h \
 	smime.h \
 	cmsreclist.h \
 	$(NULL)
 
--- a/lib/softoken/legacydb/manifest.mn
+++ b/lib/softoken/legacydb/manifest.mn
@@ -1,13 +1,13 @@
 # 
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
-CORE_DEPTH = ../../../..
+CORE_DEPTH = ../../..
 
 MODULE = nss
 
 REQUIRES = dbm 
 
 LIBRARY_NAME = nssdbm
 LIBRARY_VERSION = 3
 MAPFILE = $(OBJDIR)/nssdbm.def
--- a/lib/softoken/manifest.mn
+++ b/lib/softoken/manifest.mn
@@ -1,13 +1,13 @@
 # 
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
-CORE_DEPTH = ../../..
+CORE_DEPTH = ../..
 
 MODULE = nss
 DIRS = legacydb
 
 LIBRARY_NAME = softokn
 LIBRARY_VERSION = 3
 MAPFILE = $(OBJDIR)/softokn.def
 
--- a/lib/sqlite/manifest.mn
+++ b/lib/sqlite/manifest.mn
@@ -1,13 +1,13 @@
 # 
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
-CORE_DEPTH = ../../..
+CORE_DEPTH = ../..
 
 MODULE = nss
 
 LIBRARY_NAME = sqlite
 LIBRARY_VERSION = 3
 MAPFILE = $(OBJDIR)/sqlite.def
 DEFINES += -DSQLITE_THREADSAFE=1
 
--- a/lib/ssl/manifest.mn
+++ b/lib/ssl/manifest.mn
@@ -1,13 +1,13 @@
 # 
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
-CORE_DEPTH = ../../..
+CORE_DEPTH = ../..
 
 # DEFINES = -DTRACE
 
 EXPORTS = \
 	ssl.h \
 	sslt.h \
 	sslerr.h \
 	sslproto.h \
--- a/lib/sysinit/manifest.mn
+++ b/lib/sysinit/manifest.mn
@@ -1,14 +1,14 @@
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-CORE_DEPTH	= ../../..
+CORE_DEPTH	= ../..
 
 # MODULE public and private header  directories are implicitly REQUIRED.
 MODULE = nss 
 
 CSRCS = nsssysinit.c
 
 LIBRARY_NAME = nsssysinit
 #LIBRARY_VERSION = 3
--- a/lib/util/manifest.mn
+++ b/lib/util/manifest.mn
@@ -1,13 +1,13 @@
 # 
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
-CORE_DEPTH = ../../..
+CORE_DEPTH = ../..
 
 EXPORTS = \
 	base64.h \
 	ciferfam.h \
 	hasht.h \
 	nssb64.h \
 	nssb64t.h \
 	nsslocks.h \
--- a/lib/zlib/manifest.mn
+++ b/lib/zlib/manifest.mn
@@ -1,14 +1,14 @@
 # 
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-CORE_DEPTH = ../../..
+CORE_DEPTH = ../..
 
 MODULE = nss
 
 PRIVATE_EXPORTS = zlib.h zconf.h
 
 CSRCS =	adler32.c 	\
 	compress.c 	\
 	crc32.c 	\
--- a/manifest.mn
+++ b/manifest.mn
@@ -1,14 +1,14 @@
 # 
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
-CORE_DEPTH = ..
-DEPTH      = ..
+CORE_DEPTH = .
+DEPTH      = .
 
 IMPORTS =	nspr20/v4.8 \
 		$(NULL)
 
 RELEASE = nss
 
 DIRS = lib cmd
 
--- a/tests/common/Makefile
+++ b/tests/common/Makefile
@@ -1,15 +1,15 @@
 #! gmake
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-CORE_DEPTH	= ../../..
+CORE_DEPTH	= ../..
 
 include $(CORE_DEPTH)/coreconf/config.mk
 
 objdir_name:
 	@echo $(OBJDIR_NAME)
 
 os_arch:
 	@echo $(OS_ARCH)
--- a/tests/common/init.sh
+++ b/tests/common/init.sh
@@ -236,17 +236,17 @@ if [ -z "${INIT_SOURCED}" -o "${INIT_SOU
     HTML_PASSED='</TD><TD bgcolor=lightGreen>Passed</TD><TR>'
     HTML_UNKNOWN='</TD><TD>Unknown/TD><TR>'
     TABLE_ARGS=
 
 
 #directory name init
     SCRIPTNAME=init.sh
 
-    mozilla_root=`(cd ../../../..; pwd)`
+    mozilla_root=`(cd ../../..; pwd)`
     MOZILLA_ROOT=${MOZILLA_ROOT-$mozilla_root}
 
     qadir=`(cd ..; pwd)`
     QADIR=${QADIR-$qadir}
 
     common=${QADIR}/common
     COMMON=${TEST_COMMON-$common}
     export COMMON