diff options
| author | cls%seawood.org <devnull@localhost> | 2001-04-15 23:44:52 +0000 |
|---|---|---|
| committer | cls%seawood.org <devnull@localhost> | 2001-04-15 23:44:52 +0000 |
| commit | 0422a17d99a2d7019da5fb344e68b75a045b8301 (patch) | |
| tree | 5961efc2874e31d856614743859bd7140b648e55 | |
| parent | eba17a1bdddb7447ccd7e550e51c38db55d78694 (diff) | |
| download | nss-hg-0422a17d99a2d7019da5fb344e68b75a045b8301.tar.gz | |
Remove CORE_DEPTH & add MOD_DEPTH that points back to the directory containing config.status. Replace $(topsrcdir)/coreconf with $(CORECONF_SOURCE). Include autoconf.mk from MOD_DEPTH/coreconf instead of CORE_DEPTH/coreconf.
134 files changed, 328 insertions, 328 deletions
diff --git a/security/nss/cmd/Makefile.in b/security/nss/cmd/Makefile.in index a23fcb35b..33e7f723e 100644 --- a/security/nss/cmd/Makefile.in +++ b/security/nss/cmd/Makefile.in @@ -36,12 +36,12 @@ # (0) Initialize autoconf variables # ####################################################################### -CORE_DEPTH = ../.. +MOD_DEPTH = .. topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ -include $(CORE_DEPTH)/coreconf/autoconf.mk +include $(MOD_DEPTH)/coreconf/autoconf.mk ####################################################################### # (1) Include initial platform-independent assignments (MANDATORY). # @@ -53,7 +53,7 @@ include $(srcdir)/manifest.mn # (2) Include "global" configuration information. (OPTIONAL) # ####################################################################### -include $(topsrcdir)/coreconf/config.mk +include $(CORECONF_SOURCE)/config.mk ####################################################################### # (3) Include "component" configuration information. (OPTIONAL) # @@ -70,7 +70,7 @@ include $(topsrcdir)/coreconf/config.mk # (5) Execute "global" rules. (OPTIONAL) # ####################################################################### -include $(topsrcdir)/coreconf/rules.mk +include $(CORECONF_SOURCE)/rules.mk ####################################################################### # (6) Execute "component" rules. (OPTIONAL) # diff --git a/security/nss/cmd/SSLsample/Makefile.in b/security/nss/cmd/SSLsample/Makefile.in index eea27fe7f..12ef64f0e 100644 --- a/security/nss/cmd/SSLsample/Makefile.in +++ b/security/nss/cmd/SSLsample/Makefile.in @@ -36,24 +36,24 @@ # (0) Initialize autoconf variables # ####################################################################### -CORE_DEPTH = ../../.. +MOD_DEPTH = ../.. topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ -include $(CORE_DEPTH)/coreconf/autoconf.mk +include $(MOD_DEPTH)/coreconf/autoconf.mk ####################################################################### # (1) Include initial platform-independent assignments (MANDATORY). # ####################################################################### -DIRS = client server +# DIRS = client server ####################################################################### # (2) Include "global" configuration information. (OPTIONAL) # ####################################################################### -include $(topsrcdir)/coreconf/config.mk +include $(CORECONF_SOURCE)/config.mk ####################################################################### # (3) Include "component" configuration information. (OPTIONAL) # @@ -69,7 +69,7 @@ include $(srcdir)/../platlibs.mk # (5) Execute "global" rules. (OPTIONAL) # ####################################################################### -include $(topsrcdir)/coreconf/rules.mk +include $(CORECONF_SOURCE)/rules.mk ####################################################################### # (6) Execute "component" rules. (OPTIONAL) # diff --git a/security/nss/cmd/SSLsample/make.client b/security/nss/cmd/SSLsample/make.client index 3dd7705e3..dffc7e40d 100644 --- a/security/nss/cmd/SSLsample/make.client +++ b/security/nss/cmd/SSLsample/make.client @@ -43,13 +43,13 @@ include client.mn # (2) Include "global" configuration information. (OPTIONAL) # ####################################################################### -include $(CORE_DEPTH)/coreconf/config.mk +include $(MOD_DEPTH)/coreconf/config.mk ####################################################################### # (3) Include "component" configuration information. (OPTIONAL) # ####################################################################### -#include $(CORE_DEPTH)/$(MODULE)/config/config.mk +#include $(MOD_DEPTH)/$(MODULE)/config/config.mk ####################################################################### # (4) Include "local" platform-dependent assignments (OPTIONAL). # @@ -61,7 +61,7 @@ include ../platlibs.mk # (5) Execute "global" rules. (OPTIONAL) # ####################################################################### -include $(CORE_DEPTH)/coreconf/rules.mk +include $(MOD_DEPTH)/coreconf/rules.mk ####################################################################### # (6) Execute "component" rules. (OPTIONAL) # diff --git a/security/nss/cmd/SSLsample/make.server b/security/nss/cmd/SSLsample/make.server index 7969df798..999d4982d 100644 --- a/security/nss/cmd/SSLsample/make.server +++ b/security/nss/cmd/SSLsample/make.server @@ -43,13 +43,13 @@ include server.mn # (2) Include "global" configuration information. (OPTIONAL) # ####################################################################### -include $(CORE_DEPTH)/coreconf/config.mk +include $(MOD_DEPTH)/coreconf/config.mk ####################################################################### # (3) Include "component" configuration information. (OPTIONAL) # ####################################################################### -#include $(CORE_DEPTH)/$(MODULE)/config/config.mk +#include $(MOD_DEPTH)/$(MODULE)/config/config.mk ####################################################################### # (4) Include "local" platform-dependent assignments (OPTIONAL). # @@ -61,7 +61,7 @@ include ../platlibs.mk # (5) Execute "global" rules. (OPTIONAL) # ####################################################################### -include $(CORE_DEPTH)/coreconf/rules.mk +include $(MOD_DEPTH)/coreconf/rules.mk ####################################################################### # (6) Execute "component" rules. (OPTIONAL) # diff --git a/security/nss/cmd/addbuiltin/Makefile b/security/nss/cmd/addbuiltin/Makefile index 8650a607d..01dcc3cee 100644 --- a/security/nss/cmd/addbuiltin/Makefile +++ b/security/nss/cmd/addbuiltin/Makefile @@ -42,7 +42,7 @@ include manifest.mn # (2) Include "global" configuration information. (OPTIONAL) # ####################################################################### -include $(CORE_DEPTH)/coreconf/config.mk +include $(MOD_DEPTH)/coreconf/config.mk ####################################################################### # (3) Include "component" configuration information. (OPTIONAL) # @@ -59,7 +59,7 @@ include ../platlibs.mk # (5) Execute "global" rules. (OPTIONAL) # ####################################################################### -include $(CORE_DEPTH)/coreconf/rules.mk +include $(MOD_DEPTH)/coreconf/rules.mk ####################################################################### # (6) Execute "component" rules. (OPTIONAL) # diff --git a/security/nss/cmd/addbuiltin/manifest.mn b/security/nss/cmd/addbuiltin/manifest.mn index c664c2d6c..517af74d4 100644 --- a/security/nss/cmd/addbuiltin/manifest.mn +++ b/security/nss/cmd/addbuiltin/manifest.mn @@ -31,7 +31,7 @@ # GPL. # -CORE_DEPTH = ../../.. +MOD_DEPTH = ../.. # MODULE public and private header directories are implicitly REQUIRED. MODULE = security diff --git a/security/nss/cmd/atob/Makefile.in b/security/nss/cmd/atob/Makefile.in index 53edb2bc1..281cafd02 100644 --- a/security/nss/cmd/atob/Makefile.in +++ b/security/nss/cmd/atob/Makefile.in @@ -36,12 +36,12 @@ # (0) Initialize autoconf variables # ####################################################################### -CORE_DEPTH = ../../.. +MOD_DEPTH = ../.. topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ -include $(CORE_DEPTH)/coreconf/autoconf.mk +include $(MOD_DEPTH)/coreconf/autoconf.mk ####################################################################### # (1) Include initial platform-independent assignments (MANDATORY). # @@ -53,7 +53,7 @@ include $(srcdir)/manifest.mn # (2) Include "global" configuration information. (OPTIONAL) # ####################################################################### -include $(topsrcdir)/coreconf/config.mk +include $(CORECONF_SOURCE)/config.mk ####################################################################### # (3) Include "component" configuration information. (OPTIONAL) # @@ -69,7 +69,7 @@ include $(srcdir)/../platlibs.mk # (5) Execute "global" rules. (OPTIONAL) # ####################################################################### -include $(topsrcdir)/coreconf/rules.mk +include $(CORECONF_SOURCE)/rules.mk ####################################################################### # (6) Execute "component" rules. (OPTIONAL) # diff --git a/security/nss/cmd/atob/manifest.mn b/security/nss/cmd/atob/manifest.mn index ed3717be6..f9f77b70a 100644 --- a/security/nss/cmd/atob/manifest.mn +++ b/security/nss/cmd/atob/manifest.mn @@ -31,7 +31,7 @@ # GPL. # -CORE_DEPTH = ../../.. +MOD_DEPTH = ../.. # MODULE public and private header directories are implicitly REQUIRED. MODULE = security diff --git a/security/nss/cmd/bltest/Makefile.in b/security/nss/cmd/bltest/Makefile.in index 53edb2bc1..281cafd02 100644 --- a/security/nss/cmd/bltest/Makefile.in +++ b/security/nss/cmd/bltest/Makefile.in @@ -36,12 +36,12 @@ # (0) Initialize autoconf variables # ####################################################################### -CORE_DEPTH = ../../.. +MOD_DEPTH = ../.. topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ -include $(CORE_DEPTH)/coreconf/autoconf.mk +include $(MOD_DEPTH)/coreconf/autoconf.mk ####################################################################### # (1) Include initial platform-independent assignments (MANDATORY). # @@ -53,7 +53,7 @@ include $(srcdir)/manifest.mn # (2) Include "global" configuration information. (OPTIONAL) # ####################################################################### -include $(topsrcdir)/coreconf/config.mk +include $(CORECONF_SOURCE)/config.mk ####################################################################### # (3) Include "component" configuration information. (OPTIONAL) # @@ -69,7 +69,7 @@ include $(srcdir)/../platlibs.mk # (5) Execute "global" rules. (OPTIONAL) # ####################################################################### -include $(topsrcdir)/coreconf/rules.mk +include $(CORECONF_SOURCE)/rules.mk ####################################################################### # (6) Execute "component" rules. (OPTIONAL) # diff --git a/security/nss/cmd/bltest/manifest.mn b/security/nss/cmd/bltest/manifest.mn index 36bfadc9c..5af6b8476 100644 --- a/security/nss/cmd/bltest/manifest.mn +++ b/security/nss/cmd/bltest/manifest.mn @@ -30,7 +30,7 @@ # may use your version of this file under either the MPL or the # GPL. # -CORE_DEPTH = ../../.. +MOD_DEPTH = ../.. MODULE = security diff --git a/security/nss/cmd/btoa/Makefile.in b/security/nss/cmd/btoa/Makefile.in index 53edb2bc1..281cafd02 100644 --- a/security/nss/cmd/btoa/Makefile.in +++ b/security/nss/cmd/btoa/Makefile.in @@ -36,12 +36,12 @@ # (0) Initialize autoconf variables # ####################################################################### -CORE_DEPTH = ../../.. +MOD_DEPTH = ../.. topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ -include $(CORE_DEPTH)/coreconf/autoconf.mk +include $(MOD_DEPTH)/coreconf/autoconf.mk ####################################################################### # (1) Include initial platform-independent assignments (MANDATORY). # @@ -53,7 +53,7 @@ include $(srcdir)/manifest.mn # (2) Include "global" configuration information. (OPTIONAL) # ####################################################################### -include $(topsrcdir)/coreconf/config.mk +include $(CORECONF_SOURCE)/config.mk ####################################################################### # (3) Include "component" configuration information. (OPTIONAL) # @@ -69,7 +69,7 @@ include $(srcdir)/../platlibs.mk # (5) Execute "global" rules. (OPTIONAL) # ####################################################################### -include $(topsrcdir)/coreconf/rules.mk +include $(CORECONF_SOURCE)/rules.mk ####################################################################### # (6) Execute "component" rules. (OPTIONAL) # diff --git a/security/nss/cmd/btoa/manifest.mn b/security/nss/cmd/btoa/manifest.mn index 8bbf6ee00..44e4422e8 100644 --- a/security/nss/cmd/btoa/manifest.mn +++ b/security/nss/cmd/btoa/manifest.mn @@ -31,7 +31,7 @@ # GPL. # -CORE_DEPTH = ../../.. +MOD_DEPTH = ../.. # MODULE public and private header directories are implicitly REQUIRED. MODULE = security diff --git a/security/nss/cmd/certcgi/Makefile.in b/security/nss/cmd/certcgi/Makefile.in index 1bfd07669..8271a2b72 100644 --- a/security/nss/cmd/certcgi/Makefile.in +++ b/security/nss/cmd/certcgi/Makefile.in @@ -36,7 +36,7 @@ # (0) Initialize autoconf variables # ####################################################################### -CORE_DEPTH = ../../.. +MOD_DEPTH = ../.. topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ @@ -51,8 +51,8 @@ include $(srcdir)/manifest.mn # (2) Include "global" configuration information. (OPTIONAL) # ####################################################################### -include $(CORE_DEPTH)/coreconf/autoconf.mk -include $(topsrcdir)/coreconf/config.mk +include $(MOD_DEPTH)/coreconf/autoconf.mk +include $(CORECONF_SOURCE)/config.mk ####################################################################### # (3) Include "component" configuration information. (OPTIONAL) # @@ -68,7 +68,7 @@ include $(srcdir)/../platlibs.mk # (5) Execute "global" rules. (OPTIONAL) # ####################################################################### -include $(topsrcdir)/coreconf/rules.mk +include $(CORECONF_SOURCE)/rules.mk ####################################################################### # (6) Execute "component" rules. (OPTIONAL) # diff --git a/security/nss/cmd/certcgi/manifest.mn b/security/nss/cmd/certcgi/manifest.mn index e065a8e1a..1fb6e7b58 100644 --- a/security/nss/cmd/certcgi/manifest.mn +++ b/security/nss/cmd/certcgi/manifest.mn @@ -31,7 +31,7 @@ # GPL. # -CORE_DEPTH = ../../.. +MOD_DEPTH = ../.. # MODULE public and private header directories are implicitly REQUIREd. MODULE = security diff --git a/security/nss/cmd/certutil/Makefile.in b/security/nss/cmd/certutil/Makefile.in index 53edb2bc1..281cafd02 100644 --- a/security/nss/cmd/certutil/Makefile.in +++ b/security/nss/cmd/certutil/Makefile.in @@ -36,12 +36,12 @@ # (0) Initialize autoconf variables # ####################################################################### -CORE_DEPTH = ../../.. +MOD_DEPTH = ../.. topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ -include $(CORE_DEPTH)/coreconf/autoconf.mk +include $(MOD_DEPTH)/coreconf/autoconf.mk ####################################################################### # (1) Include initial platform-independent assignments (MANDATORY). # @@ -53,7 +53,7 @@ include $(srcdir)/manifest.mn # (2) Include "global" configuration information. (OPTIONAL) # ####################################################################### -include $(topsrcdir)/coreconf/config.mk +include $(CORECONF_SOURCE)/config.mk ####################################################################### # (3) Include "component" configuration information. (OPTIONAL) # @@ -69,7 +69,7 @@ include $(srcdir)/../platlibs.mk # (5) Execute "global" rules. (OPTIONAL) # ####################################################################### -include $(topsrcdir)/coreconf/rules.mk +include $(CORECONF_SOURCE)/rules.mk ####################################################################### # (6) Execute "component" rules. (OPTIONAL) # diff --git a/security/nss/cmd/certutil/manifest.mn b/security/nss/cmd/certutil/manifest.mn index 3b175bcf3..fa6937280 100644 --- a/security/nss/cmd/certutil/manifest.mn +++ b/security/nss/cmd/certutil/manifest.mn @@ -31,7 +31,7 @@ # GPL. # -CORE_DEPTH = ../../.. +MOD_DEPTH = ../.. DEFINES += -DNSPR20 -DSECUTIL_NEW diff --git a/security/nss/cmd/checkcert/Makefile.in b/security/nss/cmd/checkcert/Makefile.in index 53edb2bc1..281cafd02 100644 --- a/security/nss/cmd/checkcert/Makefile.in +++ b/security/nss/cmd/checkcert/Makefile.in @@ -36,12 +36,12 @@ # (0) Initialize autoconf variables # ####################################################################### -CORE_DEPTH = ../../.. +MOD_DEPTH = ../.. topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ -include $(CORE_DEPTH)/coreconf/autoconf.mk +include $(MOD_DEPTH)/coreconf/autoconf.mk ####################################################################### # (1) Include initial platform-independent assignments (MANDATORY). # @@ -53,7 +53,7 @@ include $(srcdir)/manifest.mn # (2) Include "global" configuration information. (OPTIONAL) # ####################################################################### -include $(topsrcdir)/coreconf/config.mk +include $(CORECONF_SOURCE)/config.mk ####################################################################### # (3) Include "component" configuration information. (OPTIONAL) # @@ -69,7 +69,7 @@ include $(srcdir)/../platlibs.mk # (5) Execute "global" rules. (OPTIONAL) # ####################################################################### -include $(topsrcdir)/coreconf/rules.mk +include $(CORECONF_SOURCE)/rules.mk ####################################################################### # (6) Execute "component" rules. (OPTIONAL) # diff --git a/security/nss/cmd/checkcert/manifest.mn b/security/nss/cmd/checkcert/manifest.mn index 9d5a99f73..fa2acb946 100644 --- a/security/nss/cmd/checkcert/manifest.mn +++ b/security/nss/cmd/checkcert/manifest.mn @@ -31,7 +31,7 @@ # GPL. # -CORE_DEPTH = ../../.. +MOD_DEPTH = ../.. # MODULE public and private header directories are implicitly REQUIRED. MODULE = security diff --git a/security/nss/cmd/crlutil/Makefile.in b/security/nss/cmd/crlutil/Makefile.in index 53edb2bc1..281cafd02 100644 --- a/security/nss/cmd/crlutil/Makefile.in +++ b/security/nss/cmd/crlutil/Makefile.in @@ -36,12 +36,12 @@ # (0) Initialize autoconf variables # ####################################################################### -CORE_DEPTH = ../../.. +MOD_DEPTH = ../.. topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ -include $(CORE_DEPTH)/coreconf/autoconf.mk +include $(MOD_DEPTH)/coreconf/autoconf.mk ####################################################################### # (1) Include initial platform-independent assignments (MANDATORY). # @@ -53,7 +53,7 @@ include $(srcdir)/manifest.mn # (2) Include "global" configuration information. (OPTIONAL) # ####################################################################### -include $(topsrcdir)/coreconf/config.mk +include $(CORECONF_SOURCE)/config.mk ####################################################################### # (3) Include "component" configuration information. (OPTIONAL) # @@ -69,7 +69,7 @@ include $(srcdir)/../platlibs.mk # (5) Execute "global" rules. (OPTIONAL) # ####################################################################### -include $(topsrcdir)/coreconf/rules.mk +include $(CORECONF_SOURCE)/rules.mk ####################################################################### # (6) Execute "component" rules. (OPTIONAL) # diff --git a/security/nss/cmd/crlutil/manifest.mn b/security/nss/cmd/crlutil/manifest.mn index e63d71c05..1a20586c6 100644 --- a/security/nss/cmd/crlutil/manifest.mn +++ b/security/nss/cmd/crlutil/manifest.mn @@ -31,7 +31,7 @@ # GPL. # -CORE_DEPTH = ../../.. +MOD_DEPTH = ../.. # MODULE public and private header directories are implicitly REQUIRED. MODULE = security diff --git a/security/nss/cmd/crmf-cgi/Makefile.in b/security/nss/cmd/crmf-cgi/Makefile.in index c97856b4c..dae2b46b0 100644 --- a/security/nss/cmd/crmf-cgi/Makefile.in +++ b/security/nss/cmd/crmf-cgi/Makefile.in @@ -36,12 +36,12 @@ # (0) Initialize autoconf variables # ####################################################################### -CORE_DEPTH = ../../.. +MOD_DEPTH = ../.. topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ -include $(CORE_DEPTH)/coreconf/autoconf.mk +include $(MOD_DEPTH)/coreconf/autoconf.mk ####################################################################### # (1) Include initial platform-independent assignments (MANDATORY). # @@ -53,7 +53,7 @@ include $(srcdir)/manifest.mn # (2) Include "global" configuration information. (OPTIONAL) # ####################################################################### -include $(topsrcdir)/coreconf/config.mk +include $(CORECONF_SOURCE)/config.mk ####################################################################### # (3) Include "component" configuration information. (OPTIONAL) # @@ -86,7 +86,7 @@ include $(srcdir)/../platlibs.mk # (5) Execute "global" rules. (OPTIONAL) # ####################################################################### -include $(topsrcdir)/coreconf/rules.mk +include $(CORECONF_SOURCE)/rules.mk ####################################################################### # (6) Execute "component" rules. (OPTIONAL) # diff --git a/security/nss/cmd/crmf-cgi/manifest.mn b/security/nss/cmd/crmf-cgi/manifest.mn index 98cd2c401..387a76227 100644 --- a/security/nss/cmd/crmf-cgi/manifest.mn +++ b/security/nss/cmd/crmf-cgi/manifest.mn @@ -31,7 +31,7 @@ # GPL. # -CORE_DEPTH = ../../.. +MOD_DEPTH = ../.. DEPTH = . MODULE = security diff --git a/security/nss/cmd/crmftest/Makefile.in b/security/nss/cmd/crmftest/Makefile.in index ceb161317..c3cf83296 100644 --- a/security/nss/cmd/crmftest/Makefile.in +++ b/security/nss/cmd/crmftest/Makefile.in @@ -36,12 +36,12 @@ # (0) Initialize autoconf variables # ####################################################################### -CORE_DEPTH = ../../.. +MOD_DEPTH = ../.. topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ -include $(CORE_DEPTH)/coreconf/autoconf.mk +include $(MOD_DEPTH)/coreconf/autoconf.mk ####################################################################### # (1) Include initial platform-independent assignments (MANDATORY). # @@ -53,7 +53,7 @@ include $(srcdir)/manifest.mn # (2) Include "global" configuration information. (OPTIONAL) # ####################################################################### -include $(topsrcdir)/coreconf/config.mk +include $(CORECONF_SOURCE)/config.mk ####################################################################### # (3) Include "component" configuration information. (OPTIONAL) # @@ -86,7 +86,7 @@ include $(srcdir)/../platlibs.mk # (5) Execute "global" rules. (OPTIONAL) # ####################################################################### -include $(topsrcdir)/coreconf/rules.mk +include $(CORECONF_SOURCE)/rules.mk ####################################################################### # (6) Execute "component" rules. (OPTIONAL) # diff --git a/security/nss/cmd/crmftest/manifest.mn b/security/nss/cmd/crmftest/manifest.mn index b27e4a3d8..b9ca3dc04 100644 --- a/security/nss/cmd/crmftest/manifest.mn +++ b/security/nss/cmd/crmftest/manifest.mn @@ -31,7 +31,7 @@ # GPL. # -CORE_DEPTH = ../../.. +MOD_DEPTH = ../.. DEPTH = . # MODULE public and private header directories are implicitly REQUIRED. diff --git a/security/nss/cmd/dbck/Makefile.in b/security/nss/cmd/dbck/Makefile.in index 53edb2bc1..281cafd02 100644 --- a/security/nss/cmd/dbck/Makefile.in +++ b/security/nss/cmd/dbck/Makefile.in @@ -36,12 +36,12 @@ # (0) Initialize autoconf variables # ####################################################################### -CORE_DEPTH = ../../.. +MOD_DEPTH = ../.. topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ -include $(CORE_DEPTH)/coreconf/autoconf.mk +include $(MOD_DEPTH)/coreconf/autoconf.mk ####################################################################### # (1) Include initial platform-independent assignments (MANDATORY). # @@ -53,7 +53,7 @@ include $(srcdir)/manifest.mn # (2) Include "global" configuration information. (OPTIONAL) # ####################################################################### -include $(topsrcdir)/coreconf/config.mk +include $(CORECONF_SOURCE)/config.mk ####################################################################### # (3) Include "component" configuration information. (OPTIONAL) # @@ -69,7 +69,7 @@ include $(srcdir)/../platlibs.mk # (5) Execute "global" rules. (OPTIONAL) # ####################################################################### -include $(topsrcdir)/coreconf/rules.mk +include $(CORECONF_SOURCE)/rules.mk ####################################################################### # (6) Execute "component" rules. (OPTIONAL) # diff --git a/security/nss/cmd/dbck/manifest.mn b/security/nss/cmd/dbck/manifest.mn index 8424f819d..b887cce84 100644 --- a/security/nss/cmd/dbck/manifest.mn +++ b/security/nss/cmd/dbck/manifest.mn @@ -31,7 +31,7 @@ # GPL. # -CORE_DEPTH = ../../.. +MOD_DEPTH = ../.. DEFINES += -DNSPR20 diff --git a/security/nss/cmd/derdump/Makefile.in b/security/nss/cmd/derdump/Makefile.in index 53edb2bc1..281cafd02 100644 --- a/security/nss/cmd/derdump/Makefile.in +++ b/security/nss/cmd/derdump/Makefile.in @@ -36,12 +36,12 @@ # (0) Initialize autoconf variables # ####################################################################### -CORE_DEPTH = ../../.. +MOD_DEPTH = ../.. topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ -include $(CORE_DEPTH)/coreconf/autoconf.mk +include $(MOD_DEPTH)/coreconf/autoconf.mk ####################################################################### # (1) Include initial platform-independent assignments (MANDATORY). # @@ -53,7 +53,7 @@ include $(srcdir)/manifest.mn # (2) Include "global" configuration information. (OPTIONAL) # ####################################################################### -include $(topsrcdir)/coreconf/config.mk +include $(CORECONF_SOURCE)/config.mk ####################################################################### # (3) Include "component" configuration information. (OPTIONAL) # @@ -69,7 +69,7 @@ include $(srcdir)/../platlibs.mk # (5) Execute "global" rules. (OPTIONAL) # ####################################################################### -include $(topsrcdir)/coreconf/rules.mk +include $(CORECONF_SOURCE)/rules.mk ####################################################################### # (6) Execute "component" rules. (OPTIONAL) # diff --git a/security/nss/cmd/derdump/manifest.mn b/security/nss/cmd/derdump/manifest.mn index c00df3509..0163ce5dd 100644 --- a/security/nss/cmd/derdump/manifest.mn +++ b/security/nss/cmd/derdump/manifest.mn @@ -31,7 +31,7 @@ # GPL. # -CORE_DEPTH = ../../.. +MOD_DEPTH = ../.. # MODULE public and private header directories are implicitly REQUIRED. MODULE = security diff --git a/security/nss/cmd/digest/Makefile.in b/security/nss/cmd/digest/Makefile.in index 53edb2bc1..281cafd02 100644 --- a/security/nss/cmd/digest/Makefile.in +++ b/security/nss/cmd/digest/Makefile.in @@ -36,12 +36,12 @@ # (0) Initialize autoconf variables # ####################################################################### -CORE_DEPTH = ../../.. +MOD_DEPTH = ../.. topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ -include $(CORE_DEPTH)/coreconf/autoconf.mk +include $(MOD_DEPTH)/coreconf/autoconf.mk ####################################################################### # (1) Include initial platform-independent assignments (MANDATORY). # @@ -53,7 +53,7 @@ include $(srcdir)/manifest.mn # (2) Include "global" configuration information. (OPTIONAL) # ####################################################################### -include $(topsrcdir)/coreconf/config.mk +include $(CORECONF_SOURCE)/config.mk ####################################################################### # (3) Include "component" configuration information. (OPTIONAL) # @@ -69,7 +69,7 @@ include $(srcdir)/../platlibs.mk # (5) Execute "global" rules. (OPTIONAL) # ####################################################################### -include $(topsrcdir)/coreconf/rules.mk +include $(CORECONF_SOURCE)/rules.mk ####################################################################### # (6) Execute "component" rules. (OPTIONAL) # diff --git a/security/nss/cmd/digest/manifest.mn b/security/nss/cmd/digest/manifest.mn index 8150b2c1d..310e1c8a0 100644 --- a/security/nss/cmd/digest/manifest.mn +++ b/security/nss/cmd/digest/manifest.mn @@ -31,7 +31,7 @@ # GPL. # -CORE_DEPTH = ../../.. +MOD_DEPTH = ../.. # MODULE public and private header directories are implicitly REQUIRED. MODULE = security diff --git a/security/nss/cmd/ilock/Makefile b/security/nss/cmd/ilock/Makefile index 4e39ffc3f..f38c4cb4d 100644 --- a/security/nss/cmd/ilock/Makefile +++ b/security/nss/cmd/ilock/Makefile @@ -42,7 +42,7 @@ include manifest.mn # (2) Include "global" configuration information. (OPTIONAL) # ####################################################################### -include $(CORE_DEPTH)/coreconf/config.mk +include $(MOD_DEPTH)/coreconf/config.mk ####################################################################### # (3) Include "component" configuration information. (OPTIONAL) # @@ -58,7 +58,7 @@ include ../platlibs.mk # (5) Execute "global" rules. (OPTIONAL) # ####################################################################### -include $(CORE_DEPTH)/coreconf/rules.mk +include $(MOD_DEPTH)/coreconf/rules.mk ####################################################################### # (6) Execute "component" rules. (OPTIONAL) # diff --git a/security/nss/cmd/ilock/manifest.mn b/security/nss/cmd/ilock/manifest.mn index fcea16608..4da39376e 100644 --- a/security/nss/cmd/ilock/manifest.mn +++ b/security/nss/cmd/ilock/manifest.mn @@ -30,7 +30,7 @@ # may use your version of this file under either the MPL or the # GPL. # -CORE_DEPTH = ../../.. +MOD_DEPTH = ../.. DEFINES += -DNSPR20 diff --git a/security/nss/cmd/keyutil/Makefile.in b/security/nss/cmd/keyutil/Makefile.in index 53edb2bc1..281cafd02 100644 --- a/security/nss/cmd/keyutil/Makefile.in +++ b/security/nss/cmd/keyutil/Makefile.in @@ -36,12 +36,12 @@ # (0) Initialize autoconf variables # ####################################################################### -CORE_DEPTH = ../../.. +MOD_DEPTH = ../.. topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ -include $(CORE_DEPTH)/coreconf/autoconf.mk +include $(MOD_DEPTH)/coreconf/autoconf.mk ####################################################################### # (1) Include initial platform-independent assignments (MANDATORY). # @@ -53,7 +53,7 @@ include $(srcdir)/manifest.mn # (2) Include "global" configuration information. (OPTIONAL) # ####################################################################### -include $(topsrcdir)/coreconf/config.mk +include $(CORECONF_SOURCE)/config.mk ####################################################################### # (3) Include "component" configuration information. (OPTIONAL) # @@ -69,7 +69,7 @@ include $(srcdir)/../platlibs.mk # (5) Execute "global" rules. (OPTIONAL) # ####################################################################### -include $(topsrcdir)/coreconf/rules.mk +include $(CORECONF_SOURCE)/rules.mk ####################################################################### # (6) Execute "component" rules. (OPTIONAL) # diff --git a/security/nss/cmd/keyutil/manifest.mn b/security/nss/cmd/keyutil/manifest.mn index 40b938cac..1bdd25273 100644 --- a/security/nss/cmd/keyutil/manifest.mn +++ b/security/nss/cmd/keyutil/manifest.mn @@ -31,7 +31,7 @@ # GPL. # -CORE_DEPTH = ../../.. +MOD_DEPTH = ../.. DEFINES += -DNSPR20 diff --git a/security/nss/cmd/lib/Makefile.in b/security/nss/cmd/lib/Makefile.in index a68f331d5..781393717 100644 --- a/security/nss/cmd/lib/Makefile.in +++ b/security/nss/cmd/lib/Makefile.in @@ -36,12 +36,12 @@ # (0) Initialize autoconf variables # ####################################################################### -CORE_DEPTH = ../../.. +MOD_DEPTH = ../.. topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ -include $(CORE_DEPTH)/coreconf/autoconf.mk +include $(MOD_DEPTH)/coreconf/autoconf.mk ####################################################################### # (1) Include initial platform-independent assignments (MANDATORY). # @@ -53,7 +53,7 @@ include $(srcdir)/manifest.mn # (2) Include "global" configuration information. (OPTIONAL) # ####################################################################### -include $(topsrcdir)/coreconf/config.mk +include $(CORECONF_SOURCE)/config.mk ####################################################################### # (3) Include "component" configuration information. (OPTIONAL) # @@ -71,7 +71,7 @@ include $(srcdir)/config.mk # (5) Execute "global" rules. (OPTIONAL) # ####################################################################### -include $(topsrcdir)/coreconf/rules.mk +include $(CORECONF_SOURCE)/rules.mk ####################################################################### # (6) Execute "component" rules. (OPTIONAL) # diff --git a/security/nss/cmd/lib/manifest.mn b/security/nss/cmd/lib/manifest.mn index 969596863..9475fcd3d 100644 --- a/security/nss/cmd/lib/manifest.mn +++ b/security/nss/cmd/lib/manifest.mn @@ -30,7 +30,7 @@ # may use your version of this file under either the MPL or the # GPL. # -CORE_DEPTH = ../../.. +MOD_DEPTH = ../.. LIBRARY_NAME = sectool diff --git a/security/nss/cmd/makepqg/Makefile.in b/security/nss/cmd/makepqg/Makefile.in index 53edb2bc1..281cafd02 100644 --- a/security/nss/cmd/makepqg/Makefile.in +++ b/security/nss/cmd/makepqg/Makefile.in @@ -36,12 +36,12 @@ # (0) Initialize autoconf variables # ####################################################################### -CORE_DEPTH = ../../.. +MOD_DEPTH = ../.. topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ -include $(CORE_DEPTH)/coreconf/autoconf.mk +include $(MOD_DEPTH)/coreconf/autoconf.mk ####################################################################### # (1) Include initial platform-independent assignments (MANDATORY). # @@ -53,7 +53,7 @@ include $(srcdir)/manifest.mn # (2) Include "global" configuration information. (OPTIONAL) # ####################################################################### -include $(topsrcdir)/coreconf/config.mk +include $(CORECONF_SOURCE)/config.mk ####################################################################### # (3) Include "component" configuration information. (OPTIONAL) # @@ -69,7 +69,7 @@ include $(srcdir)/../platlibs.mk # (5) Execute "global" rules. (OPTIONAL) # ####################################################################### -include $(topsrcdir)/coreconf/rules.mk +include $(CORECONF_SOURCE)/rules.mk ####################################################################### # (6) Execute "component" rules. (OPTIONAL) # diff --git a/security/nss/cmd/makepqg/manifest.mn b/security/nss/cmd/makepqg/manifest.mn index 1bf4337c1..a44d32616 100644 --- a/security/nss/cmd/makepqg/manifest.mn +++ b/security/nss/cmd/makepqg/manifest.mn @@ -31,7 +31,7 @@ # GPL. # -CORE_DEPTH = ../../.. +MOD_DEPTH = ../.. # This next line is used by .mk files # and gets translated into $LINCS in manifest.mnw diff --git a/security/nss/cmd/modutil/Makefile.in b/security/nss/cmd/modutil/Makefile.in index 776725b73..464231c73 100644 --- a/security/nss/cmd/modutil/Makefile.in +++ b/security/nss/cmd/modutil/Makefile.in @@ -36,12 +36,12 @@ # (0) Initialize autoconf variables # ####################################################################### -CORE_DEPTH = ../../.. +MOD_DEPTH = ../.. topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ -include $(CORE_DEPTH)/coreconf/autoconf.mk +include $(MOD_DEPTH)/coreconf/autoconf.mk ####################################################################### # (1) Include initial platform-independent assignments (MANDATORY). # @@ -53,7 +53,7 @@ include $(srcdir)/manifest.mn # (2) Include "global" configuration information. (OPTIONAL) # ####################################################################### -include $(topsrcdir)/coreconf/config.mk +include $(CORECONF_SOURCE)/config.mk ####################################################################### # (3) Include "component" configuration information. (OPTIONAL) # @@ -71,7 +71,7 @@ include $(srcdir)/../platlibs.mk # (5) Execute "global" rules. (OPTIONAL) # ####################################################################### -include $(topsrcdir)/coreconf/rules.mk +include $(CORECONF_SOURCE)/rules.mk ####################################################################### # (6) Execute "component" rules. (OPTIONAL) # diff --git a/security/nss/cmd/modutil/manifest.mn b/security/nss/cmd/modutil/manifest.mn index fb0ac6ae3..910a1a8ad 100644 --- a/security/nss/cmd/modutil/manifest.mn +++ b/security/nss/cmd/modutil/manifest.mn @@ -31,7 +31,7 @@ # GPL. # -CORE_DEPTH = ../../.. +MOD_DEPTH = ../.. MODULE = sectools diff --git a/security/nss/cmd/ocspclnt/Makefile.in b/security/nss/cmd/ocspclnt/Makefile.in index aa1f15d79..c013150bc 100644 --- a/security/nss/cmd/ocspclnt/Makefile.in +++ b/security/nss/cmd/ocspclnt/Makefile.in @@ -36,12 +36,12 @@ # (0) Initialize autoconf variables # ####################################################################### -CORE_DEPTH = ../../.. +MOD_DEPTH = ../.. topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ -include $(CORE_DEPTH)/coreconf/autoconf.mk +include $(MOD_DEPTH)/coreconf/autoconf.mk ####################################################################### # (1) Include initial platform-independent assignments (MANDATORY). # @@ -53,7 +53,7 @@ include $(srcdir)/manifest.mn # (2) Include "global" configuration information. (OPTIONAL) # ####################################################################### -include $(topsrcdir)/coreconf/config.mk +include $(CORECONF_SOURCE)/config.mk ####################################################################### # (3) Include "component" configuration information. (OPTIONAL) # @@ -69,7 +69,7 @@ include $(srcdir)/../platlibs.mk # (5) Execute "global" rules. (OPTIONAL) # ####################################################################### -include $(topsrcdir)/coreconf/rules.mk +include $(CORECONF_SOURCE)/rules.mk ####################################################################### # (6) Execute "component" rules. (OPTIONAL) # diff --git a/security/nss/cmd/ocspclnt/manifest.mn b/security/nss/cmd/ocspclnt/manifest.mn index 225bc7c4a..de061f4bf 100644 --- a/security/nss/cmd/ocspclnt/manifest.mn +++ b/security/nss/cmd/ocspclnt/manifest.mn @@ -31,7 +31,7 @@ # GPL. # -CORE_DEPTH = ../../.. +MOD_DEPTH = ../.. # MODULE public and private header directories are implicitly REQUIRED. MODULE = security diff --git a/security/nss/cmd/oidcalc/Makefile.in b/security/nss/cmd/oidcalc/Makefile.in index a44bee9df..e575a7959 100644 --- a/security/nss/cmd/oidcalc/Makefile.in +++ b/security/nss/cmd/oidcalc/Makefile.in @@ -36,12 +36,12 @@ # (0) Initialize autoconf variables # ####################################################################### -CORE_DEPTH = ../../.. +MOD_DEPTH = ../.. topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ -include $(CORE_DEPTH)/coreconf/autoconf.mk +include $(MOD_DEPTH)/coreconf/autoconf.mk ####################################################################### # (1) Include initial platform-independent assignments (MANDATORY). # @@ -53,7 +53,7 @@ include $(srcdir)/manifest.mn # (2) Include "global" configuration information. (OPTIONAL) # ####################################################################### -include $(topsrcdir)/coreconf/config.mk +include $(CORECONF_SOURCE)/config.mk ####################################################################### # (3) Include "component" configuration information. (OPTIONAL) # @@ -69,7 +69,7 @@ include $(srcdir)/../platlibs.mk # (5) Execute "global" rules. (OPTIONAL) # ####################################################################### -include $(topsrcdir)/coreconf/rules.mk +include $(CORECONF_SOURCE)/rules.mk ####################################################################### # (6) Execute "component" rules. (OPTIONAL) # diff --git a/security/nss/cmd/oidcalc/manifest.mn b/security/nss/cmd/oidcalc/manifest.mn index 890e112ef..4f760576e 100644 --- a/security/nss/cmd/oidcalc/manifest.mn +++ b/security/nss/cmd/oidcalc/manifest.mn @@ -31,7 +31,7 @@ # GPL. # -CORE_DEPTH = ../../.. +MOD_DEPTH = ../.. # MODULE public and private header directories are implicitly REQUIRED. MODULE = security diff --git a/security/nss/cmd/p7content/Makefile.in b/security/nss/cmd/p7content/Makefile.in index a44bee9df..e575a7959 100644 --- a/security/nss/cmd/p7content/Makefile.in +++ b/security/nss/cmd/p7content/Makefile.in @@ -36,12 +36,12 @@ # (0) Initialize autoconf variables # ####################################################################### -CORE_DEPTH = ../../.. +MOD_DEPTH = ../.. topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ -include $(CORE_DEPTH)/coreconf/autoconf.mk +include $(MOD_DEPTH)/coreconf/autoconf.mk ####################################################################### # (1) Include initial platform-independent assignments (MANDATORY). # @@ -53,7 +53,7 @@ include $(srcdir)/manifest.mn # (2) Include "global" configuration information. (OPTIONAL) # ####################################################################### -include $(topsrcdir)/coreconf/config.mk +include $(CORECONF_SOURCE)/config.mk ####################################################################### # (3) Include "component" configuration information. (OPTIONAL) # @@ -69,7 +69,7 @@ include $(srcdir)/../platlibs.mk # (5) Execute "global" rules. (OPTIONAL) # ####################################################################### -include $(topsrcdir)/coreconf/rules.mk +include $(CORECONF_SOURCE)/rules.mk ####################################################################### # (6) Execute "component" rules. (OPTIONAL) # diff --git a/security/nss/cmd/p7content/manifest.mn b/security/nss/cmd/p7content/manifest.mn index 442e51f0c..c31e38cae 100644 --- a/security/nss/cmd/p7content/manifest.mn +++ b/security/nss/cmd/p7content/manifest.mn @@ -31,7 +31,7 @@ # GPL. # -CORE_DEPTH = ../../.. +MOD_DEPTH = ../.. MODULE = security diff --git a/security/nss/cmd/p7env/Makefile.in b/security/nss/cmd/p7env/Makefile.in index a44bee9df..e575a7959 100644 --- a/security/nss/cmd/p7env/Makefile.in +++ b/security/nss/cmd/p7env/Makefile.in @@ -36,12 +36,12 @@ # (0) Initialize autoconf variables # ####################################################################### -CORE_DEPTH = ../../.. +MOD_DEPTH = ../.. topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ -include $(CORE_DEPTH)/coreconf/autoconf.mk +include $(MOD_DEPTH)/coreconf/autoconf.mk ####################################################################### # (1) Include initial platform-independent assignments (MANDATORY). # @@ -53,7 +53,7 @@ include $(srcdir)/manifest.mn # (2) Include "global" configuration information. (OPTIONAL) # ####################################################################### -include $(topsrcdir)/coreconf/config.mk +include $(CORECONF_SOURCE)/config.mk ####################################################################### # (3) Include "component" configuration information. (OPTIONAL) # @@ -69,7 +69,7 @@ include $(srcdir)/../platlibs.mk # (5) Execute "global" rules. (OPTIONAL) # ####################################################################### -include $(topsrcdir)/coreconf/rules.mk +include $(CORECONF_SOURCE)/rules.mk ####################################################################### # (6) Execute "component" rules. (OPTIONAL) # diff --git a/security/nss/cmd/p7env/manifest.mn b/security/nss/cmd/p7env/manifest.mn index 8b558b6c6..1ce7ddcd0 100644 --- a/security/nss/cmd/p7env/manifest.mn +++ b/security/nss/cmd/p7env/manifest.mn @@ -31,7 +31,7 @@ # GPL. # -CORE_DEPTH = ../../.. +MOD_DEPTH = ../.. MODULE = security diff --git a/security/nss/cmd/p7sign/Makefile.in b/security/nss/cmd/p7sign/Makefile.in index a44bee9df..e575a7959 100644 --- a/security/nss/cmd/p7sign/Makefile.in +++ b/security/nss/cmd/p7sign/Makefile.in @@ -36,12 +36,12 @@ # (0) Initialize autoconf variables # ####################################################################### -CORE_DEPTH = ../../.. +MOD_DEPTH = ../.. topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ -include $(CORE_DEPTH)/coreconf/autoconf.mk +include $(MOD_DEPTH)/coreconf/autoconf.mk ####################################################################### # (1) Include initial platform-independent assignments (MANDATORY). # @@ -53,7 +53,7 @@ include $(srcdir)/manifest.mn # (2) Include "global" configuration information. (OPTIONAL) # ####################################################################### -include $(topsrcdir)/coreconf/config.mk +include $(CORECONF_SOURCE)/config.mk ####################################################################### # (3) Include "component" configuration information. (OPTIONAL) # @@ -69,7 +69,7 @@ include $(srcdir)/../platlibs.mk # (5) Execute "global" rules. (OPTIONAL) # ####################################################################### -include $(topsrcdir)/coreconf/rules.mk +include $(CORECONF_SOURCE)/rules.mk ####################################################################### # (6) Execute "component" rules. (OPTIONAL) # diff --git a/security/nss/cmd/p7sign/manifest.mn b/security/nss/cmd/p7sign/manifest.mn index 5665dbc7b..7afd3c669 100644 --- a/security/nss/cmd/p7sign/manifest.mn +++ b/security/nss/cmd/p7sign/manifest.mn @@ -31,7 +31,7 @@ # GPL. # -CORE_DEPTH = ../../.. +MOD_DEPTH = ../.. MODULE = security diff --git a/security/nss/cmd/p7verify/Makefile.in b/security/nss/cmd/p7verify/Makefile.in index a44bee9df..e575a7959 100644 --- a/security/nss/cmd/p7verify/Makefile.in +++ b/security/nss/cmd/p7verify/Makefile.in @@ -36,12 +36,12 @@ # (0) Initialize autoconf variables # ####################################################################### -CORE_DEPTH = ../../.. +MOD_DEPTH = ../.. topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ -include $(CORE_DEPTH)/coreconf/autoconf.mk +include $(MOD_DEPTH)/coreconf/autoconf.mk ####################################################################### # (1) Include initial platform-independent assignments (MANDATORY). # @@ -53,7 +53,7 @@ include $(srcdir)/manifest.mn # (2) Include "global" configuration information. (OPTIONAL) # ####################################################################### -include $(topsrcdir)/coreconf/config.mk +include $(CORECONF_SOURCE)/config.mk ####################################################################### # (3) Include "component" configuration information. (OPTIONAL) # @@ -69,7 +69,7 @@ include $(srcdir)/../platlibs.mk # (5) Execute "global" rules. (OPTIONAL) # ####################################################################### -include $(topsrcdir)/coreconf/rules.mk +include $(CORECONF_SOURCE)/rules.mk ####################################################################### # (6) Execute "component" rules. (OPTIONAL) # diff --git a/security/nss/cmd/p7verify/manifest.mn b/security/nss/cmd/p7verify/manifest.mn index 51fd7091d..ac8b6eddd 100644 --- a/security/nss/cmd/p7verify/manifest.mn +++ b/security/nss/cmd/p7verify/manifest.mn @@ -31,7 +31,7 @@ # GPL. # -CORE_DEPTH = ../../.. +MOD_DEPTH = ../.. MODULE = security diff --git a/security/nss/cmd/pk12util/Makefile.in b/security/nss/cmd/pk12util/Makefile.in index 53edb2bc1..281cafd02 100644 --- a/security/nss/cmd/pk12util/Makefile.in +++ b/security/nss/cmd/pk12util/Makefile.in @@ -36,12 +36,12 @@ # (0) Initialize autoconf variables # ####################################################################### -CORE_DEPTH = ../../.. +MOD_DEPTH = ../.. topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ -include $(CORE_DEPTH)/coreconf/autoconf.mk +include $(MOD_DEPTH)/coreconf/autoconf.mk ####################################################################### # (1) Include initial platform-independent assignments (MANDATORY). # @@ -53,7 +53,7 @@ include $(srcdir)/manifest.mn # (2) Include "global" configuration information. (OPTIONAL) # ####################################################################### -include $(topsrcdir)/coreconf/config.mk +include $(CORECONF_SOURCE)/config.mk ####################################################################### # (3) Include "component" configuration information. (OPTIONAL) # @@ -69,7 +69,7 @@ include $(srcdir)/../platlibs.mk # (5) Execute "global" rules. (OPTIONAL) # ####################################################################### -include $(topsrcdir)/coreconf/rules.mk +include $(CORECONF_SOURCE)/rules.mk ####################################################################### # (6) Execute "component" rules. (OPTIONAL) # diff --git a/security/nss/cmd/pk12util/manifest.mn b/security/nss/cmd/pk12util/manifest.mn index a15daef6b..683bc15a7 100644 --- a/security/nss/cmd/pk12util/manifest.mn +++ b/security/nss/cmd/pk12util/manifest.mn @@ -31,7 +31,7 @@ # GPL. # -CORE_DEPTH = ../../.. +MOD_DEPTH = ../.. DEFINES += -DNSPR20 diff --git a/security/nss/cmd/pp/Makefile.in b/security/nss/cmd/pp/Makefile.in index a44bee9df..e575a7959 100644 --- a/security/nss/cmd/pp/Makefile.in +++ b/security/nss/cmd/pp/Makefile.in @@ -36,12 +36,12 @@ # (0) Initialize autoconf variables # ####################################################################### -CORE_DEPTH = ../../.. +MOD_DEPTH = ../.. topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ -include $(CORE_DEPTH)/coreconf/autoconf.mk +include $(MOD_DEPTH)/coreconf/autoconf.mk ####################################################################### # (1) Include initial platform-independent assignments (MANDATORY). # @@ -53,7 +53,7 @@ include $(srcdir)/manifest.mn # (2) Include "global" configuration information. (OPTIONAL) # ####################################################################### -include $(topsrcdir)/coreconf/config.mk +include $(CORECONF_SOURCE)/config.mk ####################################################################### # (3) Include "component" configuration information. (OPTIONAL) # @@ -69,7 +69,7 @@ include $(srcdir)/../platlibs.mk # (5) Execute "global" rules. (OPTIONAL) # ####################################################################### -include $(topsrcdir)/coreconf/rules.mk +include $(CORECONF_SOURCE)/rules.mk ####################################################################### # (6) Execute "component" rules. (OPTIONAL) # diff --git a/security/nss/cmd/pp/manifest.mn b/security/nss/cmd/pp/manifest.mn index dc0da84f9..1c66d5ae6 100644 --- a/security/nss/cmd/pp/manifest.mn +++ b/security/nss/cmd/pp/manifest.mn @@ -31,7 +31,7 @@ # GPL. # -CORE_DEPTH = ../../.. +MOD_DEPTH = ../.. # MODULE public and private header directories are implicitly REQUIRED. MODULE = security diff --git a/security/nss/cmd/rsaperf/Makefile b/security/nss/cmd/rsaperf/Makefile index cf93911eb..6ef7481a9 100644 --- a/security/nss/cmd/rsaperf/Makefile +++ b/security/nss/cmd/rsaperf/Makefile @@ -42,7 +42,7 @@ include manifest.mn # (2) Include "global" configuration information. (OPTIONAL) # ####################################################################### -include $(CORE_DEPTH)/coreconf/config.mk +include $(MOD_DEPTH)/coreconf/config.mk ####################################################################### # (3) Include "component" configuration information. (OPTIONAL) # @@ -65,7 +65,7 @@ endif # (5) Execute "global" rules. (OPTIONAL) # ####################################################################### -include $(CORE_DEPTH)/coreconf/rules.mk +include $(MOD_DEPTH)/coreconf/rules.mk ####################################################################### # (6) Execute "component" rules. (OPTIONAL) # diff --git a/security/nss/cmd/rsaperf/manifest.mn b/security/nss/cmd/rsaperf/manifest.mn index 2f2407808..55ed340d8 100644 --- a/security/nss/cmd/rsaperf/manifest.mn +++ b/security/nss/cmd/rsaperf/manifest.mn @@ -31,8 +31,8 @@ # GPL. # -DEPTH = ../../.. -CORE_DEPTH = ../../.. +DEPTH = ../.. +MOD_DEPTH = ../.. # MODULE public and private header directories are implicitly REQUIRED. MODULE = security diff --git a/security/nss/cmd/sdrtest/Makefile.in b/security/nss/cmd/sdrtest/Makefile.in index aa1f15d79..c013150bc 100644 --- a/security/nss/cmd/sdrtest/Makefile.in +++ b/security/nss/cmd/sdrtest/Makefile.in @@ -36,12 +36,12 @@ # (0) Initialize autoconf variables # ####################################################################### -CORE_DEPTH = ../../.. +MOD_DEPTH = ../.. topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ -include $(CORE_DEPTH)/coreconf/autoconf.mk +include $(MOD_DEPTH)/coreconf/autoconf.mk ####################################################################### # (1) Include initial platform-independent assignments (MANDATORY). # @@ -53,7 +53,7 @@ include $(srcdir)/manifest.mn # (2) Include "global" configuration information. (OPTIONAL) # ####################################################################### -include $(topsrcdir)/coreconf/config.mk +include $(CORECONF_SOURCE)/config.mk ####################################################################### # (3) Include "component" configuration information. (OPTIONAL) # @@ -69,7 +69,7 @@ include $(srcdir)/../platlibs.mk # (5) Execute "global" rules. (OPTIONAL) # ####################################################################### -include $(topsrcdir)/coreconf/rules.mk +include $(CORECONF_SOURCE)/rules.mk ####################################################################### # (6) Execute "component" rules. (OPTIONAL) # diff --git a/security/nss/cmd/sdrtest/manifest.mn b/security/nss/cmd/sdrtest/manifest.mn index 61daf390b..103ae72a2 100644 --- a/security/nss/cmd/sdrtest/manifest.mn +++ b/security/nss/cmd/sdrtest/manifest.mn @@ -31,7 +31,7 @@ # GPL. # -CORE_DEPTH = ../../.. +MOD_DEPTH = ../.. # MODULE public and private header directories are implicitly REQUIRED. MODULE = security diff --git a/security/nss/cmd/selfserv/Makefile.in b/security/nss/cmd/selfserv/Makefile.in index 53edb2bc1..281cafd02 100644 --- a/security/nss/cmd/selfserv/Makefile.in +++ b/security/nss/cmd/selfserv/Makefile.in @@ -36,12 +36,12 @@ # (0) Initialize autoconf variables # ####################################################################### -CORE_DEPTH = ../../.. +MOD_DEPTH = ../.. topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ -include $(CORE_DEPTH)/coreconf/autoconf.mk +include $(MOD_DEPTH)/coreconf/autoconf.mk ####################################################################### # (1) Include initial platform-independent assignments (MANDATORY). # @@ -53,7 +53,7 @@ include $(srcdir)/manifest.mn # (2) Include "global" configuration information. (OPTIONAL) # ####################################################################### -include $(topsrcdir)/coreconf/config.mk +include $(CORECONF_SOURCE)/config.mk ####################################################################### # (3) Include "component" configuration information. (OPTIONAL) # @@ -69,7 +69,7 @@ include $(srcdir)/../platlibs.mk # (5) Execute "global" rules. (OPTIONAL) # ####################################################################### -include $(topsrcdir)/coreconf/rules.mk +include $(CORECONF_SOURCE)/rules.mk ####################################################################### # (6) Execute "component" rules. (OPTIONAL) # diff --git a/security/nss/cmd/selfserv/manifest.mn b/security/nss/cmd/selfserv/manifest.mn index f8050ed9e..dd15db844 100644 --- a/security/nss/cmd/selfserv/manifest.mn +++ b/security/nss/cmd/selfserv/manifest.mn @@ -31,7 +31,7 @@ # GPL. # -CORE_DEPTH = ../../.. +MOD_DEPTH = ../.. DEFINES += -DNSPR20 diff --git a/security/nss/cmd/signtool/Makefile.in b/security/nss/cmd/signtool/Makefile.in index 986930dad..b121a50bf 100644 --- a/security/nss/cmd/signtool/Makefile.in +++ b/security/nss/cmd/signtool/Makefile.in @@ -36,12 +36,12 @@ # (0) Initialize autoconf variables # ####################################################################### -CORE_DEPTH = ../../.. +MOD_DEPTH = ../.. topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ -include $(CORE_DEPTH)/coreconf/autoconf.mk +include $(MOD_DEPTH)/coreconf/autoconf.mk ####################################################################### # (1) Include initial platform-independent assignments (MANDATORY). # @@ -53,7 +53,7 @@ include $(srcdir)/manifest.mn # (2) Include "global" configuration information. (OPTIONAL) # ####################################################################### -include $(topsrcdir)/coreconf/config.mk +include $(CORECONF_SOURCE)/config.mk ####################################################################### # (3) Include "component" configuration information. (OPTIONAL) # @@ -85,7 +85,7 @@ endif # (5) Execute "global" rules. (OPTIONAL) # ####################################################################### -include $(topsrcdir)/coreconf/rules.mk +include $(CORECONF_SOURCE)/rules.mk ####################################################################### # (6) Execute "component" rules. (OPTIONAL) # diff --git a/security/nss/cmd/signtool/manifest.mn b/security/nss/cmd/signtool/manifest.mn index df226eebe..a881a4c17 100644 --- a/security/nss/cmd/signtool/manifest.mn +++ b/security/nss/cmd/signtool/manifest.mn @@ -30,7 +30,7 @@ # GPL. # -CORE_DEPTH = ../../.. +MOD_DEPTH = ../.. MODULE = security diff --git a/security/nss/cmd/signver/Makefile.in b/security/nss/cmd/signver/Makefile.in index 53edb2bc1..281cafd02 100644 --- a/security/nss/cmd/signver/Makefile.in +++ b/security/nss/cmd/signver/Makefile.in @@ -36,12 +36,12 @@ # (0) Initialize autoconf variables # ####################################################################### -CORE_DEPTH = ../../.. +MOD_DEPTH = ../.. topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ -include $(CORE_DEPTH)/coreconf/autoconf.mk +include $(MOD_DEPTH)/coreconf/autoconf.mk ####################################################################### # (1) Include initial platform-independent assignments (MANDATORY). # @@ -53,7 +53,7 @@ include $(srcdir)/manifest.mn # (2) Include "global" configuration information. (OPTIONAL) # ####################################################################### -include $(topsrcdir)/coreconf/config.mk +include $(CORECONF_SOURCE)/config.mk ####################################################################### # (3) Include "component" configuration information. (OPTIONAL) # @@ -69,7 +69,7 @@ include $(srcdir)/../platlibs.mk # (5) Execute "global" rules. (OPTIONAL) # ####################################################################### -include $(topsrcdir)/coreconf/rules.mk +include $(CORECONF_SOURCE)/rules.mk ####################################################################### # (6) Execute "component" rules. (OPTIONAL) # diff --git a/security/nss/cmd/signver/manifest.mn b/security/nss/cmd/signver/manifest.mn index 1ddccb504..de2d03df8 100644 --- a/security/nss/cmd/signver/manifest.mn +++ b/security/nss/cmd/signver/manifest.mn @@ -30,7 +30,7 @@ # GPL. # -CORE_DEPTH = ../../.. +MOD_DEPTH = ../.. MODULE = security diff --git a/security/nss/cmd/smimetools/Makefile.in b/security/nss/cmd/smimetools/Makefile.in index 0e946c9f7..0a7d75ffa 100644 --- a/security/nss/cmd/smimetools/Makefile.in +++ b/security/nss/cmd/smimetools/Makefile.in @@ -36,12 +36,12 @@ # (0) Initialize autoconf variables # ####################################################################### -CORE_DEPTH = ../../.. +MOD_DEPTH = ../.. topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ -include $(CORE_DEPTH)/coreconf/autoconf.mk +include $(MOD_DEPTH)/coreconf/autoconf.mk ####################################################################### # (1) Include initial platform-independent assignments (MANDATORY). # @@ -53,7 +53,7 @@ include $(srcdir)/manifest.mn # (2) Include "global" configuration information. (OPTIONAL) # ####################################################################### -include $(topsrcdir)/coreconf/config.mk +include $(CORECONF_SOURCE)/config.mk ####################################################################### # (3) Include "component" configuration information. (OPTIONAL) # @@ -69,7 +69,7 @@ include $(srcdir)/../platlibs.mk # (5) Execute "global" rules. (OPTIONAL) # ####################################################################### -include $(topsrcdir)/coreconf/rules.mk +include $(CORECONF_SOURCE)/rules.mk ####################################################################### # (6) Execute "component" rules. (OPTIONAL) # diff --git a/security/nss/cmd/smimetools/manifest.mn b/security/nss/cmd/smimetools/manifest.mn index 9ed96c658..6b47e79d0 100644 --- a/security/nss/cmd/smimetools/manifest.mn +++ b/security/nss/cmd/smimetools/manifest.mn @@ -31,7 +31,7 @@ # GPL. # -CORE_DEPTH = ../../.. +MOD_DEPTH = ../.. MODULE = security diff --git a/security/nss/cmd/sslstrength/Makefile.in b/security/nss/cmd/sslstrength/Makefile.in index 53edb2bc1..281cafd02 100644 --- a/security/nss/cmd/sslstrength/Makefile.in +++ b/security/nss/cmd/sslstrength/Makefile.in @@ -36,12 +36,12 @@ # (0) Initialize autoconf variables # ####################################################################### -CORE_DEPTH = ../../.. +MOD_DEPTH = ../.. topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ -include $(CORE_DEPTH)/coreconf/autoconf.mk +include $(MOD_DEPTH)/coreconf/autoconf.mk ####################################################################### # (1) Include initial platform-independent assignments (MANDATORY). # @@ -53,7 +53,7 @@ include $(srcdir)/manifest.mn # (2) Include "global" configuration information. (OPTIONAL) # ####################################################################### -include $(topsrcdir)/coreconf/config.mk +include $(CORECONF_SOURCE)/config.mk ####################################################################### # (3) Include "component" configuration information. (OPTIONAL) # @@ -69,7 +69,7 @@ include $(srcdir)/../platlibs.mk # (5) Execute "global" rules. (OPTIONAL) # ####################################################################### -include $(topsrcdir)/coreconf/rules.mk +include $(CORECONF_SOURCE)/rules.mk ####################################################################### # (6) Execute "component" rules. (OPTIONAL) # diff --git a/security/nss/cmd/sslstrength/manifest.mn b/security/nss/cmd/sslstrength/manifest.mn index e76d1c639..e57a94aba 100644 --- a/security/nss/cmd/sslstrength/manifest.mn +++ b/security/nss/cmd/sslstrength/manifest.mn @@ -30,7 +30,7 @@ # GPL. # -CORE_DEPTH = ../../.. +MOD_DEPTH = ../.. MODULE = security diff --git a/security/nss/cmd/ssltap/Makefile.in b/security/nss/cmd/ssltap/Makefile.in index 53edb2bc1..281cafd02 100644 --- a/security/nss/cmd/ssltap/Makefile.in +++ b/security/nss/cmd/ssltap/Makefile.in @@ -36,12 +36,12 @@ # (0) Initialize autoconf variables # ####################################################################### -CORE_DEPTH = ../../.. +MOD_DEPTH = ../.. topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ -include $(CORE_DEPTH)/coreconf/autoconf.mk +include $(MOD_DEPTH)/coreconf/autoconf.mk ####################################################################### # (1) Include initial platform-independent assignments (MANDATORY). # @@ -53,7 +53,7 @@ include $(srcdir)/manifest.mn # (2) Include "global" configuration information. (OPTIONAL) # ####################################################################### -include $(topsrcdir)/coreconf/config.mk +include $(CORECONF_SOURCE)/config.mk ####################################################################### # (3) Include "component" configuration information. (OPTIONAL) # @@ -69,7 +69,7 @@ include $(srcdir)/../platlibs.mk # (5) Execute "global" rules. (OPTIONAL) # ####################################################################### -include $(topsrcdir)/coreconf/rules.mk +include $(CORECONF_SOURCE)/rules.mk ####################################################################### # (6) Execute "component" rules. (OPTIONAL) # diff --git a/security/nss/cmd/ssltap/manifest.mn b/security/nss/cmd/ssltap/manifest.mn index 0719e6de4..57bdceeb5 100644 --- a/security/nss/cmd/ssltap/manifest.mn +++ b/security/nss/cmd/ssltap/manifest.mn @@ -31,7 +31,7 @@ # GPL. # -CORE_DEPTH = ../../.. +MOD_DEPTH = ../.. # MODULE public and private header directories are implicitly REQUIRED. MODULE = security diff --git a/security/nss/cmd/strsclnt/Makefile.in b/security/nss/cmd/strsclnt/Makefile.in index a44bee9df..e575a7959 100644 --- a/security/nss/cmd/strsclnt/Makefile.in +++ b/security/nss/cmd/strsclnt/Makefile.in @@ -36,12 +36,12 @@ # (0) Initialize autoconf variables # ####################################################################### -CORE_DEPTH = ../../.. +MOD_DEPTH = ../.. topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ -include $(CORE_DEPTH)/coreconf/autoconf.mk +include $(MOD_DEPTH)/coreconf/autoconf.mk ####################################################################### # (1) Include initial platform-independent assignments (MANDATORY). # @@ -53,7 +53,7 @@ include $(srcdir)/manifest.mn # (2) Include "global" configuration information. (OPTIONAL) # ####################################################################### -include $(topsrcdir)/coreconf/config.mk +include $(CORECONF_SOURCE)/config.mk ####################################################################### # (3) Include "component" configuration information. (OPTIONAL) # @@ -69,7 +69,7 @@ include $(srcdir)/../platlibs.mk # (5) Execute "global" rules. (OPTIONAL) # ####################################################################### -include $(topsrcdir)/coreconf/rules.mk +include $(CORECONF_SOURCE)/rules.mk ####################################################################### # (6) Execute "component" rules. (OPTIONAL) # diff --git a/security/nss/cmd/strsclnt/manifest.mn b/security/nss/cmd/strsclnt/manifest.mn index 2333e2c2e..5038860fc 100644 --- a/security/nss/cmd/strsclnt/manifest.mn +++ b/security/nss/cmd/strsclnt/manifest.mn @@ -30,7 +30,7 @@ # may use your version of this file under either the MPL or the # GPL. # -CORE_DEPTH = ../../.. +MOD_DEPTH = ../.. DEFINES += -DNSPR20 diff --git a/security/nss/cmd/swfort/Makefile.in b/security/nss/cmd/swfort/Makefile.in index a44bee9df..e575a7959 100644 --- a/security/nss/cmd/swfort/Makefile.in +++ b/security/nss/cmd/swfort/Makefile.in @@ -36,12 +36,12 @@ # (0) Initialize autoconf variables # ####################################################################### -CORE_DEPTH = ../../.. +MOD_DEPTH = ../.. topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ -include $(CORE_DEPTH)/coreconf/autoconf.mk +include $(MOD_DEPTH)/coreconf/autoconf.mk ####################################################################### # (1) Include initial platform-independent assignments (MANDATORY). # @@ -53,7 +53,7 @@ include $(srcdir)/manifest.mn # (2) Include "global" configuration information. (OPTIONAL) # ####################################################################### -include $(topsrcdir)/coreconf/config.mk +include $(CORECONF_SOURCE)/config.mk ####################################################################### # (3) Include "component" configuration information. (OPTIONAL) # @@ -69,7 +69,7 @@ include $(srcdir)/../platlibs.mk # (5) Execute "global" rules. (OPTIONAL) # ####################################################################### -include $(topsrcdir)/coreconf/rules.mk +include $(CORECONF_SOURCE)/rules.mk ####################################################################### # (6) Execute "component" rules. (OPTIONAL) # diff --git a/security/nss/cmd/swfort/instinit/Makefile.in b/security/nss/cmd/swfort/instinit/Makefile.in index fde27add1..f185ab850 100644 --- a/security/nss/cmd/swfort/instinit/Makefile.in +++ b/security/nss/cmd/swfort/instinit/Makefile.in @@ -36,12 +36,12 @@ # (0) Initialize autoconf variables # ####################################################################### -CORE_DEPTH = ../../../.. +MOD_DEPTH = ../../.. topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ -include $(CORE_DEPTH)/coreconf/autoconf.mk +include $(MOD_DEPTH)/coreconf/autoconf.mk ####################################################################### # (1) Include initial platform-independent assignments (MANDATORY). # @@ -53,7 +53,7 @@ include $(srcdir)/manifest.mn # (2) Include "global" configuration information. (OPTIONAL) # ####################################################################### -include $(topsrcdir)/coreconf/config.mk +include $(CORECONF_SOURCE)/config.mk ####################################################################### # (3) Include "component" configuration information. (OPTIONAL) # @@ -69,7 +69,7 @@ include $(srcdir)/../../platlibs.mk # (5) Execute "global" rules. (OPTIONAL) # ####################################################################### -include $(topsrcdir)/coreconf/rules.mk +include $(CORECONF_SOURCE)/rules.mk ####################################################################### # (6) Execute "component" rules. (OPTIONAL) # diff --git a/security/nss/cmd/swfort/instinit/manifest.mn b/security/nss/cmd/swfort/instinit/manifest.mn index 83cb3e2da..4a8f3fe28 100644 --- a/security/nss/cmd/swfort/instinit/manifest.mn +++ b/security/nss/cmd/swfort/instinit/manifest.mn @@ -30,7 +30,7 @@ # may use your version of this file under either the MPL or the # GPL. # -CORE_DEPTH = ../../../.. +MOD_DEPTH = ../../.. DEFINES += -DNSPR20 diff --git a/security/nss/cmd/swfort/manifest.mn b/security/nss/cmd/swfort/manifest.mn index 2f8be569d..bcfc36342 100644 --- a/security/nss/cmd/swfort/manifest.mn +++ b/security/nss/cmd/swfort/manifest.mn @@ -30,7 +30,7 @@ # may use your version of this file under either the MPL or the # GPL. # -CORE_DEPTH = ../../.. +MOD_DEPTH = ../.. REQUIRES = security seccmd dbm diff --git a/security/nss/cmd/swfort/newuser/Makefile.in b/security/nss/cmd/swfort/newuser/Makefile.in index 0c0ccf744..85525ba7c 100644 --- a/security/nss/cmd/swfort/newuser/Makefile.in +++ b/security/nss/cmd/swfort/newuser/Makefile.in @@ -36,12 +36,12 @@ # (0) Initialize autoconf variables # ####################################################################### -CORE_DEPTH = ../../../.. +MOD_DEPTH = ../../.. topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ -include $(CORE_DEPTH)/coreconf/autoconf.mk +include $(MOD_DEPTH)/coreconf/autoconf.mk ####################################################################### # (1) Include initial platform-independent assignments (MANDATORY). # @@ -53,7 +53,7 @@ include $(srcdir)/manifest.mn # (2) Include "global" configuration information. (OPTIONAL) # ####################################################################### -include $(topsrcdir)/coreconf/config.mk +include $(CORECONF_SOURCE)/config.mk ####################################################################### # (3) Include "component" configuration information. (OPTIONAL) # @@ -82,7 +82,7 @@ include $(srcdir)/../../platlibs.mk # (5) Execute "global" rules. (OPTIONAL) # ####################################################################### -include $(topsrcdir)/coreconf/rules.mk +include $(CORECONF_SOURCE)/rules.mk ####################################################################### # (6) Execute "component" rules. (OPTIONAL) # diff --git a/security/nss/cmd/swfort/newuser/manifest.mn b/security/nss/cmd/swfort/newuser/manifest.mn index d48803b1e..037aa0320 100644 --- a/security/nss/cmd/swfort/newuser/manifest.mn +++ b/security/nss/cmd/swfort/newuser/manifest.mn @@ -30,7 +30,7 @@ # may use your version of this file under either the MPL or the # GPL. # -CORE_DEPTH = ../../../.. +MOD_DEPTH = ../../.. DEFINES += -DNSPR20 diff --git a/security/nss/cmd/tstclnt/Makefile.in b/security/nss/cmd/tstclnt/Makefile.in index 5f6273554..71de50f01 100644 --- a/security/nss/cmd/tstclnt/Makefile.in +++ b/security/nss/cmd/tstclnt/Makefile.in @@ -36,12 +36,12 @@ # (0) Initialize autoconf variables # ####################################################################### -CORE_DEPTH = ../../.. +MOD_DEPTH = ../.. topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ -include $(CORE_DEPTH)/coreconf/autoconf.mk +include $(MOD_DEPTH)/coreconf/autoconf.mk ####################################################################### # (1) Include initial platform-independent assignments (MANDATORY). # @@ -53,7 +53,7 @@ include $(srcdir)/manifest.mn # (2) Include "global" configuration information. (OPTIONAL) # ####################################################################### -include $(topsrcdir)/coreconf/config.mk +include $(CORECONF_SOURCE)/config.mk ####################################################################### # (3) Include "component" configuration information. (OPTIONAL) # @@ -77,7 +77,7 @@ endif # (5) Execute "global" rules. (OPTIONAL) # ####################################################################### -include $(topsrcdir)/coreconf/rules.mk +include $(CORECONF_SOURCE)/rules.mk ####################################################################### # (6) Execute "component" rules. (OPTIONAL) # diff --git a/security/nss/cmd/tstclnt/manifest.mn b/security/nss/cmd/tstclnt/manifest.mn index 00378736a..ea44b06bb 100644 --- a/security/nss/cmd/tstclnt/manifest.mn +++ b/security/nss/cmd/tstclnt/manifest.mn @@ -31,7 +31,7 @@ # GPL. # -CORE_DEPTH = ../../.. +MOD_DEPTH = ../.. # MODULE public and private header directories are implicitly REQUIRED. MODULE = security diff --git a/security/nss/cmd/ttformat/Makefile b/security/nss/cmd/ttformat/Makefile index f2a407990..96daf95e6 100644 --- a/security/nss/cmd/ttformat/Makefile +++ b/security/nss/cmd/ttformat/Makefile @@ -42,7 +42,7 @@ include manifest.mn # (2) Include "global" configuration information. (OPTIONAL) # ####################################################################### -include $(CORE_DEPTH)/coreconf/config.mk +include $(MOD_DEPTH)/coreconf/config.mk ####################################################################### # (3) Include "component" configuration information. (OPTIONAL) # @@ -57,7 +57,7 @@ include ../platlibs.mk # (5) Execute "global" rules. (OPTIONAL) # ####################################################################### -include $(CORE_DEPTH)/coreconf/rules.mk +include $(MOD_DEPTH)/coreconf/rules.mk ####################################################################### # (6) Execute "component" rules. (OPTIONAL) # diff --git a/security/nss/cmd/ttformat/manifest.mn b/security/nss/cmd/ttformat/manifest.mn index d743cfb1c..696901486 100644 --- a/security/nss/cmd/ttformat/manifest.mn +++ b/security/nss/cmd/ttformat/manifest.mn @@ -31,7 +31,7 @@ # GPL. # -CORE_DEPTH = ../../.. +MOD_DEPTH = ../.. DEFINES += -DNSPR20 diff --git a/security/nss/cmd/zlib/Makefile.in b/security/nss/cmd/zlib/Makefile.in index a97a12f9f..3e1448f91 100644 --- a/security/nss/cmd/zlib/Makefile.in +++ b/security/nss/cmd/zlib/Makefile.in @@ -36,12 +36,12 @@ # (0) Initialize autoconf variables # ####################################################################### -CORE_DEPTH = ../../.. +MOD_DEPTH = ../.. topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ -include $(CORE_DEPTH)/coreconf/autoconf.mk +include $(MOD_DEPTH)/coreconf/autoconf.mk ####################################################################### # (1) Include initial platform-independent assignments (MANDATORY). # @@ -53,7 +53,7 @@ include $(srcdir)/manifest.mn # (2) Include "global" configuration information. (OPTIONAL) # ####################################################################### -include $(topsrcdir)/coreconf/config.mk +include $(CORECONF_SOURCE)/config.mk ####################################################################### # (3) Include "component" configuration information. (OPTIONAL) # @@ -70,7 +70,7 @@ include $(srcdir)/config.mk # (5) Execute "global" rules. (OPTIONAL) # ####################################################################### -include $(topsrcdir)/coreconf/rules.mk +include $(CORECONF_SOURCE)/rules.mk ####################################################################### # (6) Execute "component" rules. (OPTIONAL) # diff --git a/security/nss/cmd/zlib/manifest.mn b/security/nss/cmd/zlib/manifest.mn index 6b4fbd4ec..b5b860cff 100644 --- a/security/nss/cmd/zlib/manifest.mn +++ b/security/nss/cmd/zlib/manifest.mn @@ -31,7 +31,7 @@ # GPL. # -CORE_DEPTH = ../../.. +MOD_DEPTH = ../.. MODULE = seccmd diff --git a/security/nss/lib/Makefile.in b/security/nss/lib/Makefile.in index 4298b7101..401213f46 100644 --- a/security/nss/lib/Makefile.in +++ b/security/nss/lib/Makefile.in @@ -36,12 +36,12 @@ # (0) Initialize autoconf variables # ####################################################################### -CORE_DEPTH = ../.. +MOD_DEPTH = .. topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ -include $(CORE_DEPTH)/coreconf/autoconf.mk +include $(MOD_DEPTH)/coreconf/autoconf.mk ####################################################################### # (1) Include initial platform-independent assignments (MANDATORY). # @@ -53,7 +53,7 @@ include $(srcdir)/manifest.mn # (2) Include "global" configuration information. (OPTIONAL) # ####################################################################### -include $(topsrcdir)/coreconf/config.mk +include $(CORECONF_SOURCE)/config.mk ####################################################################### # (3) Include "component" configuration information. (OPTIONAL) # @@ -71,7 +71,7 @@ include $(topsrcdir)/coreconf/config.mk # (5) Execute "global" rules. (OPTIONAL) # ####################################################################### -include $(topsrcdir)/coreconf/rules.mk +include $(CORECONF_SOURCE)/rules.mk ####################################################################### # (6) Execute "component" rules. (OPTIONAL) # diff --git a/security/nss/lib/asn1/Makefile b/security/nss/lib/asn1/Makefile index 03e1fb4c6..258614602 100644 --- a/security/nss/lib/asn1/Makefile +++ b/security/nss/lib/asn1/Makefile @@ -34,5 +34,5 @@ MAKEFILE_CVS_ID = "@(#) $RCSfile$ $Revision$ $Date$ $Name$" include manifest.mn include config.mk -include $(CORE_DEPTH)/coreconf/config.mk -include $(CORE_DEPTH)/coreconf/rules.mk +include $(MOD_DEPTH)/coreconf/config.mk +include $(MOD_DEPTH)/coreconf/rules.mk diff --git a/security/nss/lib/asn1/manifest.mn b/security/nss/lib/asn1/manifest.mn index 658266d8e..b07c8cd20 100644 --- a/security/nss/lib/asn1/manifest.mn +++ b/security/nss/lib/asn1/manifest.mn @@ -32,7 +32,7 @@ # MANIFEST_CVS_ID = "@(#) $RCSfile$ $Revision$ $Date$ $Name$" -CORE_DEPTH = ../../.. +MOD_DEPTH = ../.. PRIVATE_EXPORTS = \ asn1t.h \ diff --git a/security/nss/lib/base/Makefile.in b/security/nss/lib/base/Makefile.in index 2281f6233..bf7a0289b 100644 --- a/security/nss/lib/base/Makefile.in +++ b/security/nss/lib/base/Makefile.in @@ -36,12 +36,12 @@ # (0) Initialize autoconf variables # ####################################################################### -CORE_DEPTH = ../../.. +MOD_DEPTH = ../.. topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ -include $(CORE_DEPTH)/coreconf/autoconf.mk +include $(MOD_DEPTH)/coreconf/autoconf.mk ####################################################################### # (1) Include initial platform-independent assignments (MANDATORY). # @@ -53,7 +53,7 @@ include $(srcdir)/manifest.mn # (2) Include "global" configuration information. (OPTIONAL) # ####################################################################### -include $(topsrcdir)/coreconf/config.mk +include $(CORECONF_SOURCE)/config.mk ####################################################################### # (3) Include "component" configuration information. (OPTIONAL) # @@ -71,7 +71,7 @@ include $(srcdir)/config.mk # (5) Execute "global" rules. (OPTIONAL) # ####################################################################### -include $(topsrcdir)/coreconf/rules.mk +include $(CORECONF_SOURCE)/rules.mk ####################################################################### # (6) Execute "component" rules. (OPTIONAL) # diff --git a/security/nss/lib/base/manifest.mn b/security/nss/lib/base/manifest.mn index 89e64f938..2c551ac2d 100644 --- a/security/nss/lib/base/manifest.mn +++ b/security/nss/lib/base/manifest.mn @@ -32,7 +32,7 @@ # MANIFEST_CVS_ID = "@(#) $RCSfile$ $Revision$ $Date$ $Name$" -CORE_DEPTH = ../../.. +MOD_DEPTH = ../.. PRIVATE_EXPORTS = \ baset.h \ diff --git a/security/nss/lib/certdb/Makefile.in b/security/nss/lib/certdb/Makefile.in index 3ca624439..4143690e7 100644 --- a/security/nss/lib/certdb/Makefile.in +++ b/security/nss/lib/certdb/Makefile.in @@ -36,12 +36,12 @@ # (0) Initialize autoconf variables # ####################################################################### -CORE_DEPTH = ../../.. +MOD_DEPTH = ../.. topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ -include $(CORE_DEPTH)/coreconf/autoconf.mk +include $(MOD_DEPTH)/coreconf/autoconf.mk ####################################################################### # (1) Include initial platform-independent assignments (MANDATORY). # @@ -53,7 +53,7 @@ include $(srcdir)/manifest.mn # (2) Include "global" configuration information. (OPTIONAL) # ####################################################################### -include $(topsrcdir)/coreconf/config.mk +include $(CORECONF_SOURCE)/config.mk ####################################################################### # (3) Include "component" configuration information. (OPTIONAL) # @@ -71,7 +71,7 @@ include $(srcdir)/config.mk # (5) Execute "global" rules. (OPTIONAL) # ####################################################################### -include $(topsrcdir)/coreconf/rules.mk +include $(CORECONF_SOURCE)/rules.mk ####################################################################### # (6) Execute "component" rules. (OPTIONAL) # diff --git a/security/nss/lib/certdb/manifest.mn b/security/nss/lib/certdb/manifest.mn index 1cb6ff4b7..21e46a2b0 100644 --- a/security/nss/lib/certdb/manifest.mn +++ b/security/nss/lib/certdb/manifest.mn @@ -30,7 +30,7 @@ # may use your version of this file under either the MPL or the # GPL. # -CORE_DEPTH = ../../.. +MOD_DEPTH = ../.. EXPORTS = \ cert.h \ diff --git a/security/nss/lib/certhigh/Makefile.in b/security/nss/lib/certhigh/Makefile.in index 3ca624439..4143690e7 100644 --- a/security/nss/lib/certhigh/Makefile.in +++ b/security/nss/lib/certhigh/Makefile.in @@ -36,12 +36,12 @@ # (0) Initialize autoconf variables # ####################################################################### -CORE_DEPTH = ../../.. +MOD_DEPTH = ../.. topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ -include $(CORE_DEPTH)/coreconf/autoconf.mk +include $(MOD_DEPTH)/coreconf/autoconf.mk ####################################################################### # (1) Include initial platform-independent assignments (MANDATORY). # @@ -53,7 +53,7 @@ include $(srcdir)/manifest.mn # (2) Include "global" configuration information. (OPTIONAL) # ####################################################################### -include $(topsrcdir)/coreconf/config.mk +include $(CORECONF_SOURCE)/config.mk ####################################################################### # (3) Include "component" configuration information. (OPTIONAL) # @@ -71,7 +71,7 @@ include $(srcdir)/config.mk # (5) Execute "global" rules. (OPTIONAL) # ####################################################################### -include $(topsrcdir)/coreconf/rules.mk +include $(CORECONF_SOURCE)/rules.mk ####################################################################### # (6) Execute "component" rules. (OPTIONAL) # diff --git a/security/nss/lib/certhigh/manifest.mn b/security/nss/lib/certhigh/manifest.mn index d7d0a2247..c7ca58d51 100644 --- a/security/nss/lib/certhigh/manifest.mn +++ b/security/nss/lib/certhigh/manifest.mn @@ -30,7 +30,7 @@ # may use your version of this file under either the MPL or the # GPL. # -CORE_DEPTH = ../../.. +MOD_DEPTH = ../.. EXPORTS = \ ocsp.h \ diff --git a/security/nss/lib/ckfw/Makefile.in b/security/nss/lib/ckfw/Makefile.in index f27e951d6..d4426ca46 100644 --- a/security/nss/lib/ckfw/Makefile.in +++ b/security/nss/lib/ckfw/Makefile.in @@ -36,12 +36,12 @@ # (0) Initialize autoconf variables # ####################################################################### -CORE_DEPTH = ../../.. +MOD_DEPTH = ../.. topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ -include $(CORE_DEPTH)/coreconf/autoconf.mk +include $(MOD_DEPTH)/coreconf/autoconf.mk ####################################################################### # (1) Include initial platform-independent assignments (MANDATORY). # @@ -53,7 +53,7 @@ include $(srcdir)/manifest.mn # (2) Include "global" configuration information. (OPTIONAL) # ####################################################################### -include $(topsrcdir)/coreconf/config.mk +include $(CORECONF_SOURCE)/config.mk ####################################################################### # (3) Include "component" configuration information. (OPTIONAL) # @@ -71,7 +71,7 @@ include $(srcdir)/config.mk # (5) Execute "global" rules. (OPTIONAL) # ####################################################################### -include $(topsrcdir)/coreconf/rules.mk +include $(CORECONF_SOURCE)/rules.mk ####################################################################### # (6) Execute "component" rules. (OPTIONAL) # diff --git a/security/nss/lib/ckfw/builtins/Makefile.in b/security/nss/lib/ckfw/builtins/Makefile.in index 2d415f335..c59c8b711 100644 --- a/security/nss/lib/ckfw/builtins/Makefile.in +++ b/security/nss/lib/ckfw/builtins/Makefile.in @@ -36,12 +36,12 @@ # (0) Initialize autoconf variables # ####################################################################### -CORE_DEPTH = ../../../.. +MOD_DEPTH = ../../.. topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ -include $(CORE_DEPTH)/coreconf/autoconf.mk +include $(MOD_DEPTH)/coreconf/autoconf.mk ####################################################################### # (1) Include initial platform-independent assignments (MANDATORY). # @@ -53,7 +53,7 @@ include $(srcdir)/manifest.mn # (2) Include "global" configuration information. (OPTIONAL) # ####################################################################### -include $(topsrcdir)/coreconf/config.mk +include $(CORECONF_SOURCE)/config.mk ####################################################################### # (3) Include "component" configuration information. (OPTIONAL) # @@ -102,7 +102,7 @@ endif # (5) Execute "global" rules. (OPTIONAL) # ####################################################################### -include $(topsrcdir)/coreconf/rules.mk +include $(CORECONF_SOURCE)/rules.mk ####################################################################### # (6) Execute "component" rules. (OPTIONAL) # diff --git a/security/nss/lib/ckfw/builtins/manifest.mn b/security/nss/lib/ckfw/builtins/manifest.mn index 43375f873..2520c5b23 100644 --- a/security/nss/lib/ckfw/builtins/manifest.mn +++ b/security/nss/lib/ckfw/builtins/manifest.mn @@ -32,7 +32,7 @@ # MANIFEST_CVS_ID = "@(#) $RCSfile$ $Revision$ $Date$ $Name$" -CORE_DEPTH = ../../../.. +MOD_DEPTH = ../../.. MODULE = security diff --git a/security/nss/lib/ckfw/dbm/Makefile b/security/nss/lib/ckfw/dbm/Makefile index 03e1fb4c6..258614602 100644 --- a/security/nss/lib/ckfw/dbm/Makefile +++ b/security/nss/lib/ckfw/dbm/Makefile @@ -34,5 +34,5 @@ MAKEFILE_CVS_ID = "@(#) $RCSfile$ $Revision$ $Date$ $Name$" include manifest.mn include config.mk -include $(CORE_DEPTH)/coreconf/config.mk -include $(CORE_DEPTH)/coreconf/rules.mk +include $(MOD_DEPTH)/coreconf/config.mk +include $(MOD_DEPTH)/coreconf/rules.mk diff --git a/security/nss/lib/ckfw/dbm/manifest.mn b/security/nss/lib/ckfw/dbm/manifest.mn index 193e46bef..97c288d11 100644 --- a/security/nss/lib/ckfw/dbm/manifest.mn +++ b/security/nss/lib/ckfw/dbm/manifest.mn @@ -32,7 +32,7 @@ # MANIFEST_CVS_ID = "@(#) $RCSfile$ $Revision$ $Date$ $Name$" -CORE_DEPTH = ../../../.. +MOD_DEPTH = ../../.. MODULE = security diff --git a/security/nss/lib/ckfw/manifest.mn b/security/nss/lib/ckfw/manifest.mn index d228e12ab..3baa364a3 100644 --- a/security/nss/lib/ckfw/manifest.mn +++ b/security/nss/lib/ckfw/manifest.mn @@ -32,7 +32,7 @@ # MANIFEST_CVS_ID = "@(#) $RCSfile$ $Revision$ $Date$ $Name$" -CORE_DEPTH = ../../.. +MOD_DEPTH = ../.. DIRS = builtins diff --git a/security/nss/lib/crmf/Makefile.in b/security/nss/lib/crmf/Makefile.in index 2281f6233..bf7a0289b 100644 --- a/security/nss/lib/crmf/Makefile.in +++ b/security/nss/lib/crmf/Makefile.in @@ -36,12 +36,12 @@ # (0) Initialize autoconf variables # ####################################################################### -CORE_DEPTH = ../../.. +MOD_DEPTH = ../.. topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ -include $(CORE_DEPTH)/coreconf/autoconf.mk +include $(MOD_DEPTH)/coreconf/autoconf.mk ####################################################################### # (1) Include initial platform-independent assignments (MANDATORY). # @@ -53,7 +53,7 @@ include $(srcdir)/manifest.mn # (2) Include "global" configuration information. (OPTIONAL) # ####################################################################### -include $(topsrcdir)/coreconf/config.mk +include $(CORECONF_SOURCE)/config.mk ####################################################################### # (3) Include "component" configuration information. (OPTIONAL) # @@ -71,7 +71,7 @@ include $(srcdir)/config.mk # (5) Execute "global" rules. (OPTIONAL) # ####################################################################### -include $(topsrcdir)/coreconf/rules.mk +include $(CORECONF_SOURCE)/rules.mk ####################################################################### # (6) Execute "component" rules. (OPTIONAL) # diff --git a/security/nss/lib/crmf/manifest.mn b/security/nss/lib/crmf/manifest.mn index 67e145d09..7fca37e20 100644 --- a/security/nss/lib/crmf/manifest.mn +++ b/security/nss/lib/crmf/manifest.mn @@ -31,7 +31,7 @@ # GPL. # -CORE_DEPTH = ../../.. +MOD_DEPTH = ../.. MODULE = security diff --git a/security/nss/lib/cryptohi/Makefile.in b/security/nss/lib/cryptohi/Makefile.in index 3ca624439..4143690e7 100644 --- a/security/nss/lib/cryptohi/Makefile.in +++ b/security/nss/lib/cryptohi/Makefile.in @@ -36,12 +36,12 @@ # (0) Initialize autoconf variables # ####################################################################### -CORE_DEPTH = ../../.. +MOD_DEPTH = ../.. topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ -include $(CORE_DEPTH)/coreconf/autoconf.mk +include $(MOD_DEPTH)/coreconf/autoconf.mk ####################################################################### # (1) Include initial platform-independent assignments (MANDATORY). # @@ -53,7 +53,7 @@ include $(srcdir)/manifest.mn # (2) Include "global" configuration information. (OPTIONAL) # ####################################################################### -include $(topsrcdir)/coreconf/config.mk +include $(CORECONF_SOURCE)/config.mk ####################################################################### # (3) Include "component" configuration information. (OPTIONAL) # @@ -71,7 +71,7 @@ include $(srcdir)/config.mk # (5) Execute "global" rules. (OPTIONAL) # ####################################################################### -include $(topsrcdir)/coreconf/rules.mk +include $(CORECONF_SOURCE)/rules.mk ####################################################################### # (6) Execute "component" rules. (OPTIONAL) # diff --git a/security/nss/lib/cryptohi/manifest.mn b/security/nss/lib/cryptohi/manifest.mn index a4a76a7df..e1c08368b 100644 --- a/security/nss/lib/cryptohi/manifest.mn +++ b/security/nss/lib/cryptohi/manifest.mn @@ -30,7 +30,7 @@ # may use your version of this file under either the MPL or the # GPL. # -CORE_DEPTH = ../../.. +MOD_DEPTH = ../.. MODULE = security diff --git a/security/nss/lib/fortcrypt/Makefile.in b/security/nss/lib/fortcrypt/Makefile.in index 258bb005d..9f622e9b1 100644 --- a/security/nss/lib/fortcrypt/Makefile.in +++ b/security/nss/lib/fortcrypt/Makefile.in @@ -36,12 +36,12 @@ # (0) Initialize autoconf variables # ####################################################################### -CORE_DEPTH = ../../.. +MOD_DEPTH = ../.. topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ -include $(CORE_DEPTH)/coreconf/autoconf.mk +include $(MOD_DEPTH)/coreconf/autoconf.mk ####################################################################### # (1) Include initial platform-independent assignments (MANDATORY). # @@ -53,7 +53,7 @@ include $(srcdir)/manifest.mn # (2) Include "global" configuration information. (OPTIONAL) # ####################################################################### -include $(topsrcdir)/coreconf/config.mk +include $(CORECONF_SOURCE)/config.mk ####################################################################### # (3) Include "component" configuration information. (OPTIONAL) # @@ -186,7 +186,7 @@ endif ####################################################################### ifneq ($(OS_TARGET), WIN16) -include $(topsrcdir)/coreconf/rules.mk +include $(CORECONF_SOURCE)/rules.mk endif ####################################################################### diff --git a/security/nss/lib/fortcrypt/manifest.mn b/security/nss/lib/fortcrypt/manifest.mn index 6dc9019c4..0e0777a10 100644 --- a/security/nss/lib/fortcrypt/manifest.mn +++ b/security/nss/lib/fortcrypt/manifest.mn @@ -30,7 +30,7 @@ # may use your version of this file under either the MPL or the # GPL. # -CORE_DEPTH = ../../.. +MOD_DEPTH = ../.. MODULE = security LIBRARY_NAME = fort diff --git a/security/nss/lib/fortcrypt/swfort/Makefile.in b/security/nss/lib/fortcrypt/swfort/Makefile.in index a5e1078d3..5f9253e92 100644 --- a/security/nss/lib/fortcrypt/swfort/Makefile.in +++ b/security/nss/lib/fortcrypt/swfort/Makefile.in @@ -36,12 +36,12 @@ # (0) Initialize autoconf variables # ####################################################################### -CORE_DEPTH = ../../../.. +MOD_DEPTH = ../../.. topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ -include $(CORE_DEPTH)/coreconf/autoconf.mk +include $(MOD_DEPTH)/coreconf/autoconf.mk ####################################################################### # (1) Include initial platform-independent assignments (MANDATORY). # @@ -53,7 +53,7 @@ include $(srcdir)/manifest.mn # (2) Include "global" configuration information. (OPTIONAL) # ####################################################################### -include $(topsrcdir)/coreconf/config.mk +include $(CORECONF_SOURCE)/config.mk ####################################################################### # (3) Include "component" configuration information. (OPTIONAL) # @@ -71,7 +71,7 @@ include $(srcdir)/config.mk # (5) Execute "global" rules. (OPTIONAL) # ####################################################################### -include $(topsrcdir)/coreconf/rules.mk +include $(CORECONF_SOURCE)/rules.mk ####################################################################### # (6) Execute "component" rules. (OPTIONAL) # diff --git a/security/nss/lib/fortcrypt/swfort/manifest.mn b/security/nss/lib/fortcrypt/swfort/manifest.mn index 5445af13b..85994a16e 100644 --- a/security/nss/lib/fortcrypt/swfort/manifest.mn +++ b/security/nss/lib/fortcrypt/swfort/manifest.mn @@ -30,7 +30,7 @@ # may use your version of this file under either the MPL or the # GPL. # -CORE_DEPTH = ../../../.. +MOD_DEPTH = ../../.. MODULE = security LIBRARY_NAME = swfci diff --git a/security/nss/lib/fortcrypt/swfort/pkcs11/Makefile.in b/security/nss/lib/fortcrypt/swfort/pkcs11/Makefile.in index 92a33357c..0a2205165 100644 --- a/security/nss/lib/fortcrypt/swfort/pkcs11/Makefile.in +++ b/security/nss/lib/fortcrypt/swfort/pkcs11/Makefile.in @@ -36,12 +36,12 @@ # (0) Initialize autoconf variables # ####################################################################### -CORE_DEPTH = ../../../../.. +MOD_DEPTH = ../../../.. topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@:@srcdir@/../.. -include $(CORE_DEPTH)/coreconf/autoconf.mk +include $(MOD_DEPTH)/coreconf/autoconf.mk ####################################################################### # (1) Include initial platform-independent assignments (MANDATORY). # @@ -53,7 +53,7 @@ include $(srcdir)/manifest.mn # (2) Include "global" configuration information. (OPTIONAL) # ####################################################################### -include $(topsrcdir)/coreconf/config.mk +include $(CORECONF_SOURCE)/config.mk ####################################################################### # (3) Include "component" configuration information. (OPTIONAL) # @@ -211,7 +211,7 @@ INCLUDES += -I$(srcdir)/../.. ####################################################################### ifneq ($(OS_TARGET), WIN16) -include $(topsrcdir)/coreconf/rules.mk +include $(CORECONF_SOURCE)/rules.mk endif ####################################################################### diff --git a/security/nss/lib/fortcrypt/swfort/pkcs11/manifest.mn b/security/nss/lib/fortcrypt/swfort/pkcs11/manifest.mn index 5b0f5f942..fd26a415d 100644 --- a/security/nss/lib/fortcrypt/swfort/pkcs11/manifest.mn +++ b/security/nss/lib/fortcrypt/swfort/pkcs11/manifest.mn @@ -31,7 +31,7 @@ # GPL. # -CORE_DEPTH = ../../../../.. +MOD_DEPTH = ../../../.. MODULE = security LIBRARY_NAME = swft diff --git a/security/nss/lib/freebl/Makefile.in b/security/nss/lib/freebl/Makefile.in index 5dec546ad..a849e210f 100644 --- a/security/nss/lib/freebl/Makefile.in +++ b/security/nss/lib/freebl/Makefile.in @@ -36,12 +36,12 @@ # (0) Initialize autoconf variables # ####################################################################### -CORE_DEPTH = ../../.. +MOD_DEPTH = ../.. topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@:@srcdir@/mpi -include $(CORE_DEPTH)/coreconf/autoconf.mk +include $(MOD_DEPTH)/coreconf/autoconf.mk ####################################################################### # (1) Include initial platform-independent assignments (MANDATORY). # @@ -53,7 +53,7 @@ include $(srcdir)/manifest.mn # (2) Include "global" configuration information. (OPTIONAL) # ####################################################################### -include $(topsrcdir)/coreconf/config.mk +include $(CORECONF_SOURCE)/config.mk ####################################################################### # (3) Include "component" configuration information. (OPTIONAL) # @@ -202,7 +202,7 @@ INCLUDES += -I$(srcdir)/mpi # (5) Execute "global" rules. (OPTIONAL) # ####################################################################### -include $(topsrcdir)/coreconf/rules.mk +include $(CORECONF_SOURCE)/rules.mk ####################################################################### # (6) Execute "component" rules. (OPTIONAL) # diff --git a/security/nss/lib/freebl/manifest.mn b/security/nss/lib/freebl/manifest.mn index 53f5a883b..bb4352cf9 100644 --- a/security/nss/lib/freebl/manifest.mn +++ b/security/nss/lib/freebl/manifest.mn @@ -30,7 +30,7 @@ # may use your version of this file under either the MPL or the # GPL. # -CORE_DEPTH = ../../.. +MOD_DEPTH = ../.. MODULE = security @@ -38,7 +38,7 @@ ifndef FREEBL_RECURSIVE_BUILD LIBRARY_NAME = freebl else ifdef USE_PURE_32 - CORE_DEPTH = ../../../.. + MOD_DEPTH = ../../../.. LIBRARY_NAME = freebl_pure32 else LIBRARY_NAME = freebl_hybrid diff --git a/security/nss/lib/jar/Makefile.in b/security/nss/lib/jar/Makefile.in index bfab5222c..4fdf8c609 100644 --- a/security/nss/lib/jar/Makefile.in +++ b/security/nss/lib/jar/Makefile.in @@ -36,12 +36,12 @@ # (0) Initialize autoconf variables # ####################################################################### -CORE_DEPTH = ../../.. +MOD_DEPTH = ../.. topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ -include $(CORE_DEPTH)/coreconf/autoconf.mk +include $(MOD_DEPTH)/coreconf/autoconf.mk ####################################################################### # (1) Include initial platform-independent assignments (MANDATORY). # @@ -53,7 +53,7 @@ include $(srcdir)/manifest.mn # (2) Include "global" configuration information. (OPTIONAL) # ####################################################################### -include $(topsrcdir)/coreconf/config.mk +include $(CORECONF_SOURCE)/config.mk ####################################################################### # (3) Include "component" configuration information. (OPTIONAL) # @@ -71,7 +71,7 @@ include $(srcdir)/config.mk # (5) Execute "global" rules. (OPTIONAL) # ####################################################################### -include $(topsrcdir)/coreconf/rules.mk +include $(CORECONF_SOURCE)/rules.mk ####################################################################### # (6) Execute "component" rules. (OPTIONAL) # diff --git a/security/nss/lib/jar/manifest.mn b/security/nss/lib/jar/manifest.mn index 4c3e4eee3..945d29259 100644 --- a/security/nss/lib/jar/manifest.mn +++ b/security/nss/lib/jar/manifest.mn @@ -33,7 +33,7 @@ MODULE = security LIBRARY_NAME = jar -CORE_DEPTH = ../../.. +MOD_DEPTH = ../.. CSRCS = \ jarver.c \ diff --git a/security/nss/lib/manifest.mn b/security/nss/lib/manifest.mn index 1ed6947a5..b46b20ecc 100644 --- a/security/nss/lib/manifest.mn +++ b/security/nss/lib/manifest.mn @@ -30,7 +30,7 @@ # may use your version of this file under either the MPL or the # GPL. # -CORE_DEPTH = ../.. +MOD_DEPTH = .. DEPTH = ../.. DIRS = crmf jar \ diff --git a/security/nss/lib/nss/Makefile.in b/security/nss/lib/nss/Makefile.in index 3ca624439..4143690e7 100644 --- a/security/nss/lib/nss/Makefile.in +++ b/security/nss/lib/nss/Makefile.in @@ -36,12 +36,12 @@ # (0) Initialize autoconf variables # ####################################################################### -CORE_DEPTH = ../../.. +MOD_DEPTH = ../.. topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ -include $(CORE_DEPTH)/coreconf/autoconf.mk +include $(MOD_DEPTH)/coreconf/autoconf.mk ####################################################################### # (1) Include initial platform-independent assignments (MANDATORY). # @@ -53,7 +53,7 @@ include $(srcdir)/manifest.mn # (2) Include "global" configuration information. (OPTIONAL) # ####################################################################### -include $(topsrcdir)/coreconf/config.mk +include $(CORECONF_SOURCE)/config.mk ####################################################################### # (3) Include "component" configuration information. (OPTIONAL) # @@ -71,7 +71,7 @@ include $(srcdir)/config.mk # (5) Execute "global" rules. (OPTIONAL) # ####################################################################### -include $(topsrcdir)/coreconf/rules.mk +include $(CORECONF_SOURCE)/rules.mk ####################################################################### # (6) Execute "component" rules. (OPTIONAL) # diff --git a/security/nss/lib/nss/manifest.mn b/security/nss/lib/nss/manifest.mn index 5d822c170..dc98f4cab 100644 --- a/security/nss/lib/nss/manifest.mn +++ b/security/nss/lib/nss/manifest.mn @@ -30,7 +30,7 @@ # may use your version of this file under either the MPL or the # GPL. # -CORE_DEPTH = ../../.. +MOD_DEPTH = ../.. PRIVATE_EXPORTS = \ nssrenam.h \ diff --git a/security/nss/lib/pk11wrap/Makefile.in b/security/nss/lib/pk11wrap/Makefile.in index 9c57ddcb6..dca415c02 100644 --- a/security/nss/lib/pk11wrap/Makefile.in +++ b/security/nss/lib/pk11wrap/Makefile.in @@ -36,12 +36,12 @@ # (0) Initialize autoconf variables # ####################################################################### -CORE_DEPTH = ../../.. +MOD_DEPTH = ../.. topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ -include $(CORE_DEPTH)/coreconf/autoconf.mk +include $(MOD_DEPTH)/coreconf/autoconf.mk ####################################################################### # (1) Include initial platform-independent assignments (MANDATORY). # @@ -53,7 +53,7 @@ include $(srcdir)/manifest.mn # (2) Include "global" configuration information. (OPTIONAL) # ####################################################################### -include $(topsrcdir)/coreconf/config.mk +include $(CORECONF_SOURCE)/config.mk ####################################################################### # (3) Include "component" configuration information. (OPTIONAL) # @@ -71,7 +71,7 @@ include $(srcdir)/config.mk # (5) Execute "global" rules. (OPTIONAL) # ####################################################################### -include $(topsrcdir)/coreconf/rules.mk +include $(CORECONF_SOURCE)/rules.mk ####################################################################### # (6) Execute "component" rules. (OPTIONAL) # diff --git a/security/nss/lib/pk11wrap/manifest.mn b/security/nss/lib/pk11wrap/manifest.mn index 0eddc6696..c6ce97aa9 100644 --- a/security/nss/lib/pk11wrap/manifest.mn +++ b/security/nss/lib/pk11wrap/manifest.mn @@ -30,7 +30,7 @@ # may use your version of this file under either the MPL or the # GPL. # -CORE_DEPTH = ../../.. +MOD_DEPTH = ../.. EXPORTS = \ secmod.h \ diff --git a/security/nss/lib/pkcs12/Makefile.in b/security/nss/lib/pkcs12/Makefile.in index 7724fc4c4..abf4b0fa9 100644 --- a/security/nss/lib/pkcs12/Makefile.in +++ b/security/nss/lib/pkcs12/Makefile.in @@ -36,12 +36,12 @@ # (0) Initialize autoconf variables # ####################################################################### -CORE_DEPTH = ../../.. +MOD_DEPTH = ../.. topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ -include $(CORE_DEPTH)/coreconf/autoconf.mk +include $(MOD_DEPTH)/coreconf/autoconf.mk ####################################################################### # (1) Include initial platform-independent assignments (MANDATORY). # @@ -53,7 +53,7 @@ include $(srcdir)/manifest.mn # (2) Include "global" configuration information. (OPTIONAL) # ####################################################################### -include $(topsrcdir)/coreconf/config.mk +include $(CORECONF_SOURCE)/config.mk ####################################################################### # (3) Include "component" configuration information. (OPTIONAL) # @@ -71,7 +71,7 @@ include $(srcdir)/config.mk # (5) Execute "global" rules. (OPTIONAL) # ####################################################################### -include $(topsrcdir)/coreconf/rules.mk +include $(CORECONF_SOURCE)/rules.mk ####################################################################### # (6) Execute "component" rules. (OPTIONAL) # diff --git a/security/nss/lib/pkcs12/manifest.mn b/security/nss/lib/pkcs12/manifest.mn index c8b4981d3..1531befd0 100644 --- a/security/nss/lib/pkcs12/manifest.mn +++ b/security/nss/lib/pkcs12/manifest.mn @@ -31,7 +31,7 @@ # GPL. # -CORE_DEPTH = ../../.. +MOD_DEPTH = ../.. EXPORTS = \ pkcs12t.h \ diff --git a/security/nss/lib/pkcs7/Makefile.in b/security/nss/lib/pkcs7/Makefile.in index 34abec6c1..aac1abec3 100644 --- a/security/nss/lib/pkcs7/Makefile.in +++ b/security/nss/lib/pkcs7/Makefile.in @@ -36,12 +36,12 @@ # (0) Initialize autoconf variables # ####################################################################### -CORE_DEPTH = ../../.. +MOD_DEPTH = ../.. topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ -include $(CORE_DEPTH)/coreconf/autoconf.mk +include $(MOD_DEPTH)/coreconf/autoconf.mk ####################################################################### # (1) Include initial platform-independent assignments (MANDATORY). # @@ -53,7 +53,7 @@ include $(srcdir)/manifest.mn # (2) Include "global" configuration information. (OPTIONAL) # ####################################################################### -include $(topsrcdir)/coreconf/config.mk +include $(CORECONF_SOURCE)/config.mk ####################################################################### # (3) Include "component" configuration information. (OPTIONAL) # @@ -71,7 +71,7 @@ include $(srcdir)/config.mk # (5) Execute "global" rules. (OPTIONAL) # ####################################################################### -include $(topsrcdir)/coreconf/rules.mk +include $(CORECONF_SOURCE)/rules.mk ####################################################################### # (6) Execute "component" rules. (OPTIONAL) # diff --git a/security/nss/lib/pkcs7/manifest.mn b/security/nss/lib/pkcs7/manifest.mn index 64cc3e05f..e95e6ccff 100644 --- a/security/nss/lib/pkcs7/manifest.mn +++ b/security/nss/lib/pkcs7/manifest.mn @@ -31,7 +31,7 @@ # GPL. # -CORE_DEPTH = ../../.. +MOD_DEPTH = ../.. EXPORTS = \ secmime.h \ diff --git a/security/nss/lib/pki1/Makefile b/security/nss/lib/pki1/Makefile index 03e1fb4c6..258614602 100644 --- a/security/nss/lib/pki1/Makefile +++ b/security/nss/lib/pki1/Makefile @@ -34,5 +34,5 @@ MAKEFILE_CVS_ID = "@(#) $RCSfile$ $Revision$ $Date$ $Name$" include manifest.mn include config.mk -include $(CORE_DEPTH)/coreconf/config.mk -include $(CORE_DEPTH)/coreconf/rules.mk +include $(MOD_DEPTH)/coreconf/config.mk +include $(MOD_DEPTH)/coreconf/rules.mk diff --git a/security/nss/lib/pki1/manifest.mn b/security/nss/lib/pki1/manifest.mn index 8e032d974..cf9459d26 100644 --- a/security/nss/lib/pki1/manifest.mn +++ b/security/nss/lib/pki1/manifest.mn @@ -32,7 +32,7 @@ # MANIFEST_CVS_ID = "@(#) $RCSfile$ $Revision$ $Date$ $Name$" -CORE_DEPTH = ../../.. +MOD_DEPTH = ../.. PRIVATE_EXPORTS = \ pki1.h \ diff --git a/security/nss/lib/smime/Makefile.in b/security/nss/lib/smime/Makefile.in index f71b2833a..035d25f0e 100644 --- a/security/nss/lib/smime/Makefile.in +++ b/security/nss/lib/smime/Makefile.in @@ -36,12 +36,12 @@ # (0) Initialize autoconf variables # ####################################################################### -CORE_DEPTH = ../../.. +MOD_DEPTH = ../.. topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ -include $(CORE_DEPTH)/coreconf/autoconf.mk +include $(MOD_DEPTH)/coreconf/autoconf.mk ####################################################################### # (1) Include initial platform-independent assignments (MANDATORY). # @@ -53,7 +53,7 @@ include $(srcdir)/manifest.mn # (2) Include "global" configuration information. (OPTIONAL) # ####################################################################### -include $(topsrcdir)/coreconf/config.mk +include $(CORECONF_SOURCE)/config.mk ####################################################################### # (3) Include "component" configuration information. (OPTIONAL) # @@ -71,7 +71,7 @@ include $(srcdir)/config.mk # (5) Execute "global" rules. (OPTIONAL) # ####################################################################### -include $(topsrcdir)/coreconf/rules.mk +include $(CORECONF_SOURCE)/rules.mk ####################################################################### # (6) Execute "component" rules. (OPTIONAL) # diff --git a/security/nss/lib/smime/manifest.mn b/security/nss/lib/smime/manifest.mn index 6e526dfb4..8494e809d 100644 --- a/security/nss/lib/smime/manifest.mn +++ b/security/nss/lib/smime/manifest.mn @@ -31,7 +31,7 @@ # GPL. # -CORE_DEPTH = ../../.. +MOD_DEPTH = ../.. EXPORTS = \ cms.h \ diff --git a/security/nss/lib/softoken/Makefile.in b/security/nss/lib/softoken/Makefile.in index 57805320e..126c465f7 100644 --- a/security/nss/lib/softoken/Makefile.in +++ b/security/nss/lib/softoken/Makefile.in @@ -36,12 +36,12 @@ # (0) Initialize autoconf variables # ####################################################################### -CORE_DEPTH = ../../.. +MOD_DEPTH = ../.. topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ -include $(CORE_DEPTH)/coreconf/autoconf.mk +include $(MOD_DEPTH)/coreconf/autoconf.mk ####################################################################### # (1) Include initial platform-independent assignments (MANDATORY). # @@ -53,7 +53,7 @@ include $(srcdir)/manifest.mn # (2) Include "global" configuration information. (OPTIONAL) # ####################################################################### -include $(topsrcdir)/coreconf/config.mk +include $(CORECONF_SOURCE)/config.mk ####################################################################### # (3) Include "component" configuration information. (OPTIONAL) # @@ -71,7 +71,7 @@ include $(srcdir)/config.mk # (5) Execute "global" rules. (OPTIONAL) # ####################################################################### -include $(topsrcdir)/coreconf/rules.mk +include $(CORECONF_SOURCE)/rules.mk ####################################################################### # (6) Execute "component" rules. (OPTIONAL) # diff --git a/security/nss/lib/softoken/manifest.mn b/security/nss/lib/softoken/manifest.mn index 75d5e9fc2..d34e5f7b6 100644 --- a/security/nss/lib/softoken/manifest.mn +++ b/security/nss/lib/softoken/manifest.mn @@ -30,7 +30,7 @@ # may use your version of this file under either the MPL or the # GPL. # -CORE_DEPTH = ../../.. +MOD_DEPTH = ../.. MODULE = security diff --git a/security/nss/lib/ssl/Makefile.in b/security/nss/lib/ssl/Makefile.in index abbadf5bb..4b377c143 100644 --- a/security/nss/lib/ssl/Makefile.in +++ b/security/nss/lib/ssl/Makefile.in @@ -36,12 +36,12 @@ # (0) Initialize autoconf variables # ####################################################################### -CORE_DEPTH = ../../.. +MOD_DEPTH = ../.. topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ -include $(CORE_DEPTH)/coreconf/autoconf.mk +include $(MOD_DEPTH)/coreconf/autoconf.mk ####################################################################### # (1) Include initial platform-independent assignments (MANDATORY). # @@ -64,7 +64,7 @@ endif # (2) Include "global" configuration information. (OPTIONAL) # ####################################################################### -include $(topsrcdir)/coreconf/config.mk +include $(CORECONF_SOURCE)/config.mk ####################################################################### # (3) Include "component" configuration information. (OPTIONAL) # @@ -82,7 +82,7 @@ include $(srcdir)/config.mk # (5) Execute "global" rules. (OPTIONAL) # ####################################################################### -include $(topsrcdir)/coreconf/rules.mk +include $(CORECONF_SOURCE)/rules.mk ####################################################################### # (6) Execute "component" rules. (OPTIONAL) # diff --git a/security/nss/lib/ssl/manifest.mn b/security/nss/lib/ssl/manifest.mn index e76c516f1..1e9a6fd4f 100644 --- a/security/nss/lib/ssl/manifest.mn +++ b/security/nss/lib/ssl/manifest.mn @@ -30,7 +30,7 @@ # may use your version of this file under either the MPL or the # GPL. # -CORE_DEPTH = ../../.. +MOD_DEPTH = ../.. # DEFINES = -DTRACE diff --git a/security/nss/lib/util/Makefile.in b/security/nss/lib/util/Makefile.in index ebcaff4a4..58ed84d4b 100644 --- a/security/nss/lib/util/Makefile.in +++ b/security/nss/lib/util/Makefile.in @@ -36,12 +36,12 @@ # (0) Initialize autoconf variables # ####################################################################### -CORE_DEPTH = ../../.. +MOD_DEPTH = ../.. topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ -include $(CORE_DEPTH)/coreconf/autoconf.mk +include $(MOD_DEPTH)/coreconf/autoconf.mk ####################################################################### # (1) Include initial platform-independent assignments (MANDATORY). # @@ -57,7 +57,7 @@ ifeq ($(OS_ARCH),HP-UX) ASFILES += ret_cr16.s endif -include $(topsrcdir)/coreconf/config.mk +include $(CORECONF_SOURCE)/config.mk ####################################################################### # (3) Include "component" configuration information. (OPTIONAL) # @@ -75,7 +75,7 @@ include $(srcdir)/config.mk # (5) Execute "global" rules. (OPTIONAL) # ####################################################################### -include $(topsrcdir)/coreconf/rules.mk +include $(CORECONF_SOURCE)/rules.mk ####################################################################### # (6) Execute "component" rules. (OPTIONAL) # diff --git a/security/nss/lib/util/manifest.mn b/security/nss/lib/util/manifest.mn index 3e89b483e..1700aa5a0 100644 --- a/security/nss/lib/util/manifest.mn +++ b/security/nss/lib/util/manifest.mn @@ -30,7 +30,7 @@ # may use your version of this file under either the MPL or the # GPL. # -CORE_DEPTH = ../../.. +MOD_DEPTH = ../.. EXPORTS = \ base64.h \ |