Update makefiles so NT will build. (and other platforms that don't have symbolic links)

26 files changed, 53 insertions, 53 deletions

diff --git a/security/nss/cmd/atob/Makefile b/security/nss/cmd/atob/Makefile
index 61e6468d1..ff6f06e7e 100644
--- a/security/nss/cmd/atob/Makefile
+++ b/security/nss/cmd/atob/Makefile
@@ -52,7 +52,7 @@ include $(CORE_DEPTH)/coreconf/config.mk
 # (4) Include "local" platform-dependent assignments (OPTIONAL).      #
 #######################################################################
 
-include $(CORE_DEPTH)/security/cmd/platlibs.mk
+include ../platlibs.mk
 
 
 #######################################################################
@@ -72,5 +72,5 @@ include $(CORE_DEPTH)/coreconf/rules.mk
 #######################################################################
 
 
-include $(CORE_DEPTH)/security/cmd/platrules.mk
+include ../platrules.mk
 
diff --git a/security/nss/cmd/btoa/Makefile b/security/nss/cmd/btoa/Makefile
index f927c2cd4..763faa253 100644
--- a/security/nss/cmd/btoa/Makefile
+++ b/security/nss/cmd/btoa/Makefile
@@ -52,7 +52,7 @@ include $(CORE_DEPTH)/coreconf/config.mk
 # (4) Include "local" platform-dependent assignments (OPTIONAL).      #
 #######################################################################
 
-include $(CORE_DEPTH)/security/cmd/platlibs.mk
+include ../platlibs.mk
 
 #######################################################################
 # (5) Execute "global" rules. (OPTIONAL)                              #
@@ -71,5 +71,5 @@ include $(CORE_DEPTH)/coreconf/rules.mk
 #######################################################################
 
 
-include $(CORE_DEPTH)/security/cmd/platrules.mk
+include ../platrules.mk
 
diff --git a/security/nss/cmd/certcgi/Makefile b/security/nss/cmd/certcgi/Makefile
index 63d4702cd..573c12cac 100644
--- a/security/nss/cmd/certcgi/Makefile
+++ b/security/nss/cmd/certcgi/Makefile
@@ -52,7 +52,7 @@ include $(CORE_DEPTH)/coreconf/config.mk
 # (4) Include "local" platform-dependent assignments (OPTIONAL).      #
 #######################################################################
 
-include $(CORE_DEPTH)/security/cmd/platlibs.mk
+include ../platlibs.mk
 
 #######################################################################
 # (5) Execute "global" rules. (OPTIONAL)                              #
@@ -72,5 +72,5 @@ include $(CORE_DEPTH)/coreconf/rules.mk
 
 
 
-include $(CORE_DEPTH)/security/cmd/platrules.mk
+include ../platrules.mk
 
diff --git a/security/nss/cmd/certutil/Makefile b/security/nss/cmd/certutil/Makefile
index 587e774da..8650a607d 100644
--- a/security/nss/cmd/certutil/Makefile
+++ b/security/nss/cmd/certutil/Makefile
@@ -52,7 +52,7 @@ include $(CORE_DEPTH)/coreconf/config.mk
 # (4) Include "local" platform-dependent assignments (OPTIONAL).      #
 #######################################################################
 
-include $(CORE_DEPTH)/security/cmd/platlibs.mk
+include ../platlibs.mk
 
 
 #######################################################################
@@ -72,5 +72,5 @@ include $(CORE_DEPTH)/coreconf/rules.mk
 #######################################################################
 
 
-include $(CORE_DEPTH)/security/cmd/platrules.mk
+include ../platrules.mk
  
diff --git a/security/nss/cmd/checkcert/Makefile b/security/nss/cmd/checkcert/Makefile
index 63d4702cd..573c12cac 100644
--- a/security/nss/cmd/checkcert/Makefile
+++ b/security/nss/cmd/checkcert/Makefile
@@ -52,7 +52,7 @@ include $(CORE_DEPTH)/coreconf/config.mk
 # (4) Include "local" platform-dependent assignments (OPTIONAL).      #
 #######################################################################
 
-include $(CORE_DEPTH)/security/cmd/platlibs.mk
+include ../platlibs.mk
 
 #######################################################################
 # (5) Execute "global" rules. (OPTIONAL)                              #
@@ -72,5 +72,5 @@ include $(CORE_DEPTH)/coreconf/rules.mk
 
 
 
-include $(CORE_DEPTH)/security/cmd/platrules.mk
+include ../platrules.mk
 
diff --git a/security/nss/cmd/crlutil/Makefile b/security/nss/cmd/crlutil/Makefile
index 63d4702cd..573c12cac 100644
--- a/security/nss/cmd/crlutil/Makefile
+++ b/security/nss/cmd/crlutil/Makefile
@@ -52,7 +52,7 @@ include $(CORE_DEPTH)/coreconf/config.mk
 # (4) Include "local" platform-dependent assignments (OPTIONAL).      #
 #######################################################################
 
-include $(CORE_DEPTH)/security/cmd/platlibs.mk
+include ../platlibs.mk
 
 #######################################################################
 # (5) Execute "global" rules. (OPTIONAL)                              #
@@ -72,5 +72,5 @@ include $(CORE_DEPTH)/coreconf/rules.mk
 
 
 
-include $(CORE_DEPTH)/security/cmd/platrules.mk
+include ../platrules.mk
 
diff --git a/security/nss/cmd/crmf-cgi/Makefile b/security/nss/cmd/crmf-cgi/Makefile
index f30b29dcd..e9b03eaf1 100644
--- a/security/nss/cmd/crmf-cgi/Makefile
+++ b/security/nss/cmd/crmf-cgi/Makefile
@@ -70,7 +70,7 @@ else
 EXTRA_LIBS += $(DIST)/lib/libcrmf.a
 endif
 
-include $(CORE_DEPTH)/security/cmd/platlibs.mk
+include ../platlibs.mk
 
 
 #######################################################################
@@ -93,4 +93,4 @@ include $(CORE_DEPTH)/coreconf/rules.mk
 lame:
 	echo $(CPU_ARCH)
 
-include $(CORE_DEPTH)/security/cmd/platrules.mk
+include ../platrules.mk
diff --git a/security/nss/cmd/crmftest/Makefile b/security/nss/cmd/crmftest/Makefile
index 951bf7f4a..3c393e58d 100644
--- a/security/nss/cmd/crmftest/Makefile
+++ b/security/nss/cmd/crmftest/Makefile
@@ -69,7 +69,7 @@ else
 EXTRA_LIBS += $(DIST)/lib/libcrmf.a 
 endif
 
-include $(CORE_DEPTH)/security/cmd/platlibs.mk
+include ../platlibs.mk
 
 #######################################################################
 # (5) Execute "global" rules. (OPTIONAL)                              #
@@ -96,4 +96,4 @@ endif
 lame:
 	echo $(CPU_ARCH)
 
-include $(CORE_DEPTH)/security/cmd/platrules.mk
+include ../platrules.mk
diff --git a/security/nss/cmd/derdump/Makefile b/security/nss/cmd/derdump/Makefile
index 63d4702cd..573c12cac 100644
--- a/security/nss/cmd/derdump/Makefile
+++ b/security/nss/cmd/derdump/Makefile
@@ -52,7 +52,7 @@ include $(CORE_DEPTH)/coreconf/config.mk
 # (4) Include "local" platform-dependent assignments (OPTIONAL).      #
 #######################################################################
 
-include $(CORE_DEPTH)/security/cmd/platlibs.mk
+include ../platlibs.mk
 
 #######################################################################
 # (5) Execute "global" rules. (OPTIONAL)                              #
@@ -72,5 +72,5 @@ include $(CORE_DEPTH)/coreconf/rules.mk
 
 
 
-include $(CORE_DEPTH)/security/cmd/platrules.mk
+include ../platrules.mk
 
diff --git a/security/nss/cmd/digest/Makefile b/security/nss/cmd/digest/Makefile
index 63d4702cd..573c12cac 100644
--- a/security/nss/cmd/digest/Makefile
+++ b/security/nss/cmd/digest/Makefile
@@ -52,7 +52,7 @@ include $(CORE_DEPTH)/coreconf/config.mk
 # (4) Include "local" platform-dependent assignments (OPTIONAL).      #
 #######################################################################
 
-include $(CORE_DEPTH)/security/cmd/platlibs.mk
+include ../platlibs.mk
 
 #######################################################################
 # (5) Execute "global" rules. (OPTIONAL)                              #
@@ -72,5 +72,5 @@ include $(CORE_DEPTH)/coreconf/rules.mk
 
 
 
-include $(CORE_DEPTH)/security/cmd/platrules.mk
+include ../platrules.mk
 
diff --git a/security/nss/cmd/keyutil/Makefile b/security/nss/cmd/keyutil/Makefile
index f7c3001e5..a2ed814be 100644
--- a/security/nss/cmd/keyutil/Makefile
+++ b/security/nss/cmd/keyutil/Makefile
@@ -52,7 +52,7 @@ include $(CORE_DEPTH)/coreconf/config.mk
 # (4) Include "local" platform-dependent assignments (OPTIONAL).      #
 #######################################################################
 
-include $(CORE_DEPTH)/security/cmd/platlibs.mk
+include ../platlibs.mk
 
 #######################################################################
 # (5) Execute "global" rules. (OPTIONAL)                              #
@@ -70,4 +70,4 @@ include $(CORE_DEPTH)/coreconf/rules.mk
 # (7) Execute "local" rules. (OPTIONAL).                              #
 #######################################################################
 
-include $(CORE_DEPTH)/security/cmd/platrules.mk
+include ../platrules.mk
diff --git a/security/nss/cmd/makepqg/Makefile b/security/nss/cmd/makepqg/Makefile
index 06b8fb641..36bf774fb 100644
--- a/security/nss/cmd/makepqg/Makefile
+++ b/security/nss/cmd/makepqg/Makefile
@@ -52,7 +52,7 @@ include $(CORE_DEPTH)/coreconf/config.mk
 # (4) Include "local" platform-dependent assignments (OPTIONAL).      #
 #######################################################################
 
-include $(CORE_DEPTH)/security/cmd/platlibs.mk
+include ../platlibs.mk
 
 
 #######################################################################
@@ -72,6 +72,6 @@ include $(CORE_DEPTH)/coreconf/rules.mk
 #######################################################################
 
 
-include $(CORE_DEPTH)/security/cmd/platrules.mk
+include ../platrules.mk
  
 
diff --git a/security/nss/cmd/modutil/Makefile b/security/nss/cmd/modutil/Makefile
index 0efcc44f2..5f4321fec 100644
--- a/security/nss/cmd/modutil/Makefile
+++ b/security/nss/cmd/modutil/Makefile
@@ -51,7 +51,7 @@ include $(CORE_DEPTH)/coreconf/config.mk
 #######################################################################
 # (4) Include "local" platform-dependent assignments (OPTIONAL).      #
 #######################################################################
-include $(CORE_DEPTH)/security/cmd/platlibs.mk
+include ../platlibs.mk
 
 #######################################################################
 # (5) Execute "global" rules. (OPTIONAL)                              #
@@ -70,7 +70,7 @@ include $(CORE_DEPTH)/coreconf/rules.mk
 #######################################################################
 
 
-include $(CORE_DEPTH)/security/cmd/platrules.mk
+include ../platrules.mk
 
 ifeq ($(OS_ARCH), WINNT)
 installparse.c:  installparse.y
diff --git a/security/nss/cmd/ocspclnt/Makefile b/security/nss/cmd/ocspclnt/Makefile
index 6895bd3cd..490f738e5 100644
--- a/security/nss/cmd/ocspclnt/Makefile
+++ b/security/nss/cmd/ocspclnt/Makefile
@@ -52,7 +52,7 @@ include $(CORE_DEPTH)/coreconf/config.mk
 # (4) Include "local" platform-dependent assignments (OPTIONAL).      #
 #######################################################################
 
-include $(CORE_DEPTH)/security/cmd/platlibs.mk
+include ../platlibs.mk
 
 #######################################################################
 # (5) Execute "global" rules. (OPTIONAL)                              #
@@ -70,4 +70,4 @@ include $(CORE_DEPTH)/coreconf/rules.mk
 #######################################################################
 
 
-include $(CORE_DEPTH)/security/cmd/platrules.mk
+include ../platrules.mk
diff --git a/security/nss/cmd/oidcalc/Makefile b/security/nss/cmd/oidcalc/Makefile
index a1d6d9d82..689240abd 100644
--- a/security/nss/cmd/oidcalc/Makefile
+++ b/security/nss/cmd/oidcalc/Makefile
@@ -52,7 +52,7 @@ include $(CORE_DEPTH)/coreconf/config.mk
 # (4) Include "local" platform-dependent assignments (OPTIONAL).      #
 #######################################################################
 
-include $(CORE_DEPTH)/security/cmd/platlibs.mk
+include ../platlibs.mk
 
 
 #######################################################################
@@ -72,5 +72,5 @@ include $(CORE_DEPTH)/coreconf/rules.mk
 #######################################################################
 
 
-include $(CORE_DEPTH)/security/cmd/platrules.mk
+include ../platrules.mk
 
diff --git a/security/nss/cmd/p7content/Makefile b/security/nss/cmd/p7content/Makefile
index 46fd7f1c7..4e39ffc3f 100644
--- a/security/nss/cmd/p7content/Makefile
+++ b/security/nss/cmd/p7content/Makefile
@@ -52,7 +52,7 @@ include $(CORE_DEPTH)/coreconf/config.mk
 # (4) Include "local" platform-dependent assignments (OPTIONAL).      #
 #######################################################################
 
-include $(CORE_DEPTH)/security/cmd/platlibs.mk
+include ../platlibs.mk
 
 #######################################################################
 # (5) Execute "global" rules. (OPTIONAL)                              #
@@ -71,5 +71,5 @@ include $(CORE_DEPTH)/coreconf/rules.mk
 #######################################################################
 
 
-include $(CORE_DEPTH)/security/cmd/platrules.mk
+include ../platrules.mk
 
diff --git a/security/nss/cmd/p7env/Makefile b/security/nss/cmd/p7env/Makefile
index 46fd7f1c7..4e39ffc3f 100644
--- a/security/nss/cmd/p7env/Makefile
+++ b/security/nss/cmd/p7env/Makefile
@@ -52,7 +52,7 @@ include $(CORE_DEPTH)/coreconf/config.mk
 # (4) Include "local" platform-dependent assignments (OPTIONAL).      #
 #######################################################################
 
-include $(CORE_DEPTH)/security/cmd/platlibs.mk
+include ../platlibs.mk
 
 #######################################################################
 # (5) Execute "global" rules. (OPTIONAL)                              #
@@ -71,5 +71,5 @@ include $(CORE_DEPTH)/coreconf/rules.mk
 #######################################################################
 
 
-include $(CORE_DEPTH)/security/cmd/platrules.mk
+include ../platrules.mk
 
diff --git a/security/nss/cmd/p7sign/Makefile b/security/nss/cmd/p7sign/Makefile
index 46fd7f1c7..4e39ffc3f 100644
--- a/security/nss/cmd/p7sign/Makefile
+++ b/security/nss/cmd/p7sign/Makefile
@@ -52,7 +52,7 @@ include $(CORE_DEPTH)/coreconf/config.mk
 # (4) Include "local" platform-dependent assignments (OPTIONAL).      #
 #######################################################################
 
-include $(CORE_DEPTH)/security/cmd/platlibs.mk
+include ../platlibs.mk
 
 #######################################################################
 # (5) Execute "global" rules. (OPTIONAL)                              #
@@ -71,5 +71,5 @@ include $(CORE_DEPTH)/coreconf/rules.mk
 #######################################################################
 
 
-include $(CORE_DEPTH)/security/cmd/platrules.mk
+include ../platrules.mk
 
diff --git a/security/nss/cmd/p7verify/Makefile b/security/nss/cmd/p7verify/Makefile
index 46fd7f1c7..4e39ffc3f 100644
--- a/security/nss/cmd/p7verify/Makefile
+++ b/security/nss/cmd/p7verify/Makefile
@@ -52,7 +52,7 @@ include $(CORE_DEPTH)/coreconf/config.mk
 # (4) Include "local" platform-dependent assignments (OPTIONAL).      #
 #######################################################################
 
-include $(CORE_DEPTH)/security/cmd/platlibs.mk
+include ../platlibs.mk
 
 #######################################################################
 # (5) Execute "global" rules. (OPTIONAL)                              #
@@ -71,5 +71,5 @@ include $(CORE_DEPTH)/coreconf/rules.mk
 #######################################################################
 
 
-include $(CORE_DEPTH)/security/cmd/platrules.mk
+include ../platrules.mk
 
diff --git a/security/nss/cmd/pp/Makefile b/security/nss/cmd/pp/Makefile
index 46fd7f1c7..4e39ffc3f 100644
--- a/security/nss/cmd/pp/Makefile
+++ b/security/nss/cmd/pp/Makefile
@@ -52,7 +52,7 @@ include $(CORE_DEPTH)/coreconf/config.mk
 # (4) Include "local" platform-dependent assignments (OPTIONAL).      #
 #######################################################################
 
-include $(CORE_DEPTH)/security/cmd/platlibs.mk
+include ../platlibs.mk
 
 #######################################################################
 # (5) Execute "global" rules. (OPTIONAL)                              #
@@ -71,5 +71,5 @@ include $(CORE_DEPTH)/coreconf/rules.mk
 #######################################################################
 
 
-include $(CORE_DEPTH)/security/cmd/platrules.mk
+include ../platrules.mk
 
diff --git a/security/nss/cmd/selfserv/Makefile b/security/nss/cmd/selfserv/Makefile
index 58a123db5..f2a407990 100644
--- a/security/nss/cmd/selfserv/Makefile
+++ b/security/nss/cmd/selfserv/Makefile
@@ -51,7 +51,7 @@ include $(CORE_DEPTH)/coreconf/config.mk
 #######################################################################
 # (4) Include "local" platform-dependent assignments (OPTIONAL).      #
 #######################################################################
-include $(CORE_DEPTH)/security/cmd/platlibs.mk
+include ../platlibs.mk
 
 #######################################################################
 # (5) Execute "global" rules. (OPTIONAL)                              #
@@ -70,5 +70,5 @@ include $(CORE_DEPTH)/coreconf/rules.mk
 #######################################################################
 
 
-include $(CORE_DEPTH)/security/cmd/platrules.mk
+include ../platrules.mk
 
diff --git a/security/nss/cmd/ssltap/Makefile b/security/nss/cmd/ssltap/Makefile
index 29096d371..f6d8cc93e 100644
--- a/security/nss/cmd/ssltap/Makefile
+++ b/security/nss/cmd/ssltap/Makefile
@@ -55,7 +55,7 @@ include $(CORE_DEPTH)/coreconf/config.mk
 # Since ssltap doesn't use any of NSS, we'll skip NSS's link libs,
 # and just link with NSPR.
 #
-include $(CORE_DEPTH)/security/cmd/platlibs.mk
+include ../platlibs.mk
 
 #######################################################################
 # (5) Execute "global" rules. (OPTIONAL)                              #
@@ -75,5 +75,5 @@ include $(CORE_DEPTH)/coreconf/rules.mk
 
 
 
--include $(CORE_DEPTH)/security/cmd/platrules.mk
+-include ../platrules.mk
 
diff --git a/security/nss/cmd/strsclnt/Makefile b/security/nss/cmd/strsclnt/Makefile
index 46fd7f1c7..4e39ffc3f 100644
--- a/security/nss/cmd/strsclnt/Makefile
+++ b/security/nss/cmd/strsclnt/Makefile
@@ -52,7 +52,7 @@ include $(CORE_DEPTH)/coreconf/config.mk
 # (4) Include "local" platform-dependent assignments (OPTIONAL).      #
 #######################################################################
 
-include $(CORE_DEPTH)/security/cmd/platlibs.mk
+include ../platlibs.mk
 
 #######################################################################
 # (5) Execute "global" rules. (OPTIONAL)                              #
@@ -71,5 +71,5 @@ include $(CORE_DEPTH)/coreconf/rules.mk
 #######################################################################
 
 
-include $(CORE_DEPTH)/security/cmd/platrules.mk
+include ../platrules.mk
 
diff --git a/security/nss/cmd/swfort/instinit/Makefile b/security/nss/cmd/swfort/instinit/Makefile
index e7d1b0033..f912d54cd 100644
--- a/security/nss/cmd/swfort/instinit/Makefile
+++ b/security/nss/cmd/swfort/instinit/Makefile
@@ -52,7 +52,7 @@ include $(CORE_DEPTH)/coreconf/config.mk
 # (4) Include "local" platform-dependent assignments (OPTIONAL).      #
 #######################################################################
 
-include $(CORE_DEPTH)/security/cmd/platlibs.mk
+include ../../platlibs.mk
 
 
 #######################################################################
@@ -72,4 +72,4 @@ include $(CORE_DEPTH)/coreconf/rules.mk
 #######################################################################
 
 
-include $(CORE_DEPTH)/security/cmd/platrules.mk
+include ../../platrules.mk
diff --git a/security/nss/cmd/swfort/newuser/Makefile b/security/nss/cmd/swfort/newuser/Makefile
index 2d9bfe173..907b29e6f 100644
--- a/security/nss/cmd/swfort/newuser/Makefile
+++ b/security/nss/cmd/swfort/newuser/Makefile
@@ -64,7 +64,7 @@ EXTRA_LIBS += \
 	$(NULL)
 endif
 
-include $(CORE_DEPTH)/security/cmd/platlibs.mk
+include ../../platlibs.mk
 
 
 #######################################################################
@@ -83,5 +83,5 @@ include $(CORE_DEPTH)/coreconf/rules.mk
 # (7) Execute "local" rules. (OPTIONAL).                              #
 #######################################################################
 
-include $(CORE_DEPTH)/security/cmd/platrules.mk
+include ../../platrules.mk
 
diff --git a/security/nss/cmd/tstclnt/Makefile b/security/nss/cmd/tstclnt/Makefile
index 8b4b4379b..7e236b453 100644
--- a/security/nss/cmd/tstclnt/Makefile
+++ b/security/nss/cmd/tstclnt/Makefile
@@ -52,7 +52,7 @@ include $(CORE_DEPTH)/coreconf/config.mk
 # (4) Include "local" platform-dependent assignments (OPTIONAL).      #
 #######################################################################
 
-include $(CORE_DEPTH)/security/cmd/platlibs.mk
+include ../platlibs.mk
 
 ifeq ($(OS_ARCH), WINNT)
 ifndef BUILD_OPT
@@ -72,11 +72,11 @@ include $(CORE_DEPTH)/coreconf/rules.mk
 # (6) Execute "component" rules. (OPTIONAL)                           #
 #######################################################################
 
-#include $(CORE_DEPTH)/security/cmd/platlibs.mk
+#include ../platlibs.mk
 
 #######################################################################
 # (7) Execute "local" rules. (OPTIONAL).                              #
 #######################################################################
 
-include $(CORE_DEPTH)/security/cmd/platrules.mk
+include ../platrules.mk