|
 |
2533fc |
diff -up ./nss/cmd/certutil/Makefile.iquote ./nss/cmd/certutil/Makefile
|
|
|
1b6f66 |
--- ./nss/cmd/certutil/Makefile.iquote 2015-11-08 21:12:59.000000000 -0800
|
|
|
1b6f66 |
+++ ./nss/cmd/certutil/Makefile 2016-02-06 08:03:25.509936899 -0800
|
|
|
1b6f66 |
@@ -37,7 +37,8 @@ include $(CORE_DEPTH)/coreconf/rules.mk
|
|
|
2533fc |
# (6) Execute "component" rules. (OPTIONAL) #
|
|
|
2533fc |
#######################################################################
|
|
|
2533fc |
|
|
|
1b6f66 |
-
|
|
|
2533fc |
+INCLUDES += -iquote $(DIST)/../public/nss
|
|
|
1b6f66 |
+INCLUDES += -iquote $(DIST)/../private/nss
|
|
|
2533fc |
|
|
|
2533fc |
#######################################################################
|
|
|
1b6f66 |
# (7) Execute "local" rules. (OPTIONAL). #
|
|
|
66ebb3 |
diff -up ./nss/cmd/httpserv/Makefile.iquote ./nss/cmd/httpserv/Makefile
|
|
|
1b6f66 |
--- ./nss/cmd/httpserv/Makefile.iquote 2015-11-08 21:12:59.000000000 -0800
|
|
|
1b6f66 |
+++ ./nss/cmd/httpserv/Makefile 2016-02-06 08:00:39.403191706 -0800
|
|
|
66ebb3 |
@@ -35,7 +35,8 @@ include $(CORE_DEPTH)/coreconf/rules.mk
|
|
|
66ebb3 |
# (6) Execute "component" rules. (OPTIONAL) #
|
|
|
66ebb3 |
#######################################################################
|
|
|
66ebb3 |
|
|
|
66ebb3 |
-
|
|
|
66ebb3 |
+INCLUDES += -iquote $(DIST)/../private/nss
|
|
|
66ebb3 |
+INCLUDES += -iquote $(DIST)/../public/nss
|
|
|
66ebb3 |
|
|
|
66ebb3 |
#######################################################################
|
|
|
66ebb3 |
# (7) Execute "local" rules. (OPTIONAL). #
|
|
|
66ebb3 |
diff -up ./nss/cmd/lib/Makefile.iquote ./nss/cmd/lib/Makefile
|
|
|
1b6f66 |
--- ./nss/cmd/lib/Makefile.iquote 2015-11-08 21:12:59.000000000 -0800
|
|
|
1b6f66 |
+++ ./nss/cmd/lib/Makefile 2016-02-06 08:00:39.403191706 -0800
|
|
|
f57139 |
@@ -38,7 +38,8 @@ include $(CORE_DEPTH)/coreconf/rules.mk
|
|
|
f57139 |
# (6) Execute "component" rules. (OPTIONAL) #
|
|
|
f57139 |
#######################################################################
|
|
|
f57139 |
|
|
|
f57139 |
-
|
|
|
f57139 |
+INCLUDES += -iquote $(DIST)/../private/nss
|
|
|
f57139 |
+INCLUDES += -iquote $(DIST)/../public/nss
|
|
|
f57139 |
|
|
|
f57139 |
#######################################################################
|
|
|
f57139 |
# (7) Execute "local" rules. (OPTIONAL). #
|
|
|
652e94 |
diff -up ./nss/cmd/modutil/Makefile.iquote ./nss/cmd/modutil/Makefile
|
|
|
1b6f66 |
--- ./nss/cmd/modutil/Makefile.iquote 2015-11-08 21:12:59.000000000 -0800
|
|
|
1b6f66 |
+++ ./nss/cmd/modutil/Makefile 2016-02-06 08:00:39.403191706 -0800
|
|
|
652e94 |
@@ -41,7 +41,8 @@ include $(CORE_DEPTH)/coreconf/rules.mk
|
|
|
652e94 |
# (6) Execute "component" rules. (OPTIONAL) #
|
|
|
652e94 |
#######################################################################
|
|
|
652e94 |
|
|
|
652e94 |
-
|
|
|
652e94 |
+INCLUDES += -iquote $(DIST)/../public/nss
|
|
|
652e94 |
+INCLUDES += -iquote $(DIST)/../private/nss
|
|
|
652e94 |
|
|
|
652e94 |
#######################################################################
|
|
|
652e94 |
# (7) Execute "local" rules. (OPTIONAL). #
|
|
|
652e94 |
diff -up ./nss/cmd/selfserv/Makefile.iquote ./nss/cmd/selfserv/Makefile
|
|
|
1b6f66 |
--- ./nss/cmd/selfserv/Makefile.iquote 2015-11-08 21:12:59.000000000 -0800
|
|
|
1b6f66 |
+++ ./nss/cmd/selfserv/Makefile 2016-02-06 08:00:39.403191706 -0800
|
|
|
652e94 |
@@ -35,7 +35,8 @@ include $(CORE_DEPTH)/coreconf/rules.mk
|
|
|
652e94 |
# (6) Execute "component" rules. (OPTIONAL) #
|
|
|
652e94 |
#######################################################################
|
|
|
652e94 |
|
|
|
652e94 |
-
|
|
|
652e94 |
+INCLUDES += -iquote $(DIST)/../public/nss
|
|
|
652e94 |
+INCLUDES += -iquote $(DIST)/../private/nss
|
|
|
652e94 |
|
|
|
652e94 |
#######################################################################
|
|
|
652e94 |
# (7) Execute "local" rules. (OPTIONAL). #
|
|
|
652e94 |
diff -up ./nss/cmd/ssltap/Makefile.iquote ./nss/cmd/ssltap/Makefile
|
|
|
1b6f66 |
--- ./nss/cmd/ssltap/Makefile.iquote 2015-11-08 21:12:59.000000000 -0800
|
|
|
1b6f66 |
+++ ./nss/cmd/ssltap/Makefile 2016-02-06 08:04:21.595228841 -0800
|
|
|
652e94 |
@@ -39,7 +39,8 @@ include $(CORE_DEPTH)/coreconf/rules.mk
|
|
|
652e94 |
# (6) Execute "component" rules. (OPTIONAL) #
|
|
|
652e94 |
#######################################################################
|
|
|
652e94 |
|
|
|
652e94 |
-
|
|
|
652e94 |
+INCLUDES += -iquote $(DIST)/../private/nss
|
|
|
1b6f66 |
+INCLUDES += -iquote $(DIST)/../public/nss
|
|
|
652e94 |
|
|
|
652e94 |
#######################################################################
|
|
|
652e94 |
# (7) Execute "local" rules. (OPTIONAL). #
|
|
|
652e94 |
diff -up ./nss/cmd/strsclnt/Makefile.iquote ./nss/cmd/strsclnt/Makefile
|
|
|
1b6f66 |
--- ./nss/cmd/strsclnt/Makefile.iquote 2015-11-08 21:12:59.000000000 -0800
|
|
|
1b6f66 |
+++ ./nss/cmd/strsclnt/Makefile 2016-02-06 08:00:39.404191687 -0800
|
|
|
652e94 |
@@ -36,7 +36,8 @@ include $(CORE_DEPTH)/coreconf/rules.mk
|
|
|
652e94 |
# (6) Execute "component" rules. (OPTIONAL) #
|
|
|
652e94 |
#######################################################################
|
|
|
652e94 |
|
|
|
652e94 |
-
|
|
|
652e94 |
+INCLUDES += -iquote $(DIST)/../public/nss
|
|
|
652e94 |
+INCLUDES += -iquote $(DIST)/../private/nss
|
|
|
652e94 |
|
|
|
652e94 |
#######################################################################
|
|
|
652e94 |
# (7) Execute "local" rules. (OPTIONAL). #
|
|
|
652e94 |
diff -up ./nss/cmd/tstclnt/Makefile.iquote ./nss/cmd/tstclnt/Makefile
|
|
|
1b6f66 |
--- ./nss/cmd/tstclnt/Makefile.iquote 2015-11-08 21:12:59.000000000 -0800
|
|
|
1b6f66 |
+++ ./nss/cmd/tstclnt/Makefile 2016-02-06 08:04:40.506961353 -0800
|
|
|
1b6f66 |
@@ -37,6 +37,8 @@ include $(CORE_DEPTH)/coreconf/rules.mk
|
|
|
652e94 |
#######################################################################
|
|
|
652e94 |
|
|
|
1b6f66 |
#include ../platlibs.mk
|
|
|
652e94 |
+INCLUDES += -iquote $(DIST)/../public/nss
|
|
|
652e94 |
+INCLUDES += -iquote $(DIST)/../private/nss
|
|
|
652e94 |
|
|
|
1b6f66 |
#######################################################################
|
|
|
652e94 |
# (7) Execute "local" rules. (OPTIONAL). #
|
|
|
1b6f66 |
diff -up ./nss/cmd/vfyserv/Makefile.iquote ./nss/cmd/vfyserv/Makefile
|
|
|
1b6f66 |
--- ./nss/cmd/vfyserv/Makefile.iquote 2015-11-08 21:12:59.000000000 -0800
|
|
|
1b6f66 |
+++ ./nss/cmd/vfyserv/Makefile 2016-02-06 08:04:55.758745631 -0800
|
|
|
1b6f66 |
@@ -37,6 +37,8 @@ include $(CORE_DEPTH)/coreconf/rules.mk
|
|
|
652e94 |
#######################################################################
|
|
|
652e94 |
|
|
|
1b6f66 |
#include ../platlibs.mk
|
|
|
652e94 |
+INCLUDES += -iquote $(DIST)/../public/nss
|
|
|
652e94 |
+INCLUDES += -iquote $(DIST)/../private/nss
|
|
|
652e94 |
|
|
|
1b6f66 |
#######################################################################
|
|
|
1b6f66 |
# (7) Execute "local" rules. (OPTIONAL). #
|
|
|
66ebb3 |
diff -up ./nss/coreconf/location.mk.iquote ./nss/coreconf/location.mk
|
|
|
1b6f66 |
--- ./nss/coreconf/location.mk.iquote 2015-11-08 21:12:59.000000000 -0800
|
|
|
1b6f66 |
+++ ./nss/coreconf/location.mk 2016-02-06 08:00:39.404191687 -0800
|
|
|
f57139 |
@@ -45,6 +45,10 @@ endif
|
|
|
f57139 |
|
|
|
f57139 |
ifdef NSS_INCLUDE_DIR
|
|
|
f57139 |
INCLUDES += -I$(NSS_INCLUDE_DIR)
|
|
|
f57139 |
+ ifdef IN_TREE_FREEBL_HEADERS_FIRST
|
|
|
f57139 |
+ INCLUDES += -iquote $(DIST)/../public/nss
|
|
|
f57139 |
+ INCLUDES += -iquote $(DIST)/../private/nss
|
|
|
f57139 |
+ endif
|
|
|
f57139 |
endif
|
|
|
f57139 |
|
|
|
f57139 |
ifndef NSS_LIB_DIR
|
|
|
66ebb3 |
diff -up ./nss/lib/certhigh/Makefile.iquote ./nss/lib/certhigh/Makefile
|
|
|
1b6f66 |
--- ./nss/lib/certhigh/Makefile.iquote 2015-11-08 21:12:59.000000000 -0800
|
|
|
1b6f66 |
+++ ./nss/lib/certhigh/Makefile 2016-02-06 08:00:39.404191687 -0800
|
|
|
f57139 |
@@ -38,7 +38,7 @@ include $(CORE_DEPTH)/coreconf/rules.mk
|
|
|
f57139 |
# (6) Execute "component" rules. (OPTIONAL) #
|
|
|
f57139 |
#######################################################################
|
|
|
f57139 |
|
|
|
f57139 |
-
|
|
|
f57139 |
+INCLUDES += -iquote $(DIST)/../public/nss
|
|
|
f57139 |
|
|
|
f57139 |
#######################################################################
|
|
|
f57139 |
# (7) Execute "local" rules. (OPTIONAL). #
|
|
|
66ebb3 |
diff -up ./nss/lib/cryptohi/Makefile.iquote ./nss/lib/cryptohi/Makefile
|
|
|
1b6f66 |
--- ./nss/lib/cryptohi/Makefile.iquote 2015-11-08 21:12:59.000000000 -0800
|
|
|
1b6f66 |
+++ ./nss/lib/cryptohi/Makefile 2016-02-06 08:00:39.404191687 -0800
|
|
|
f57139 |
@@ -38,7 +38,7 @@ include $(CORE_DEPTH)/coreconf/rules.mk
|
|
|
f57139 |
# (6) Execute "component" rules. (OPTIONAL) #
|
|
|
f57139 |
#######################################################################
|
|
|
f57139 |
|
|
|
f57139 |
-
|
|
|
f57139 |
+INCLUDES += -iquote $(DIST)/../public/nss
|
|
|
f57139 |
|
|
|
f57139 |
#######################################################################
|
|
|
f57139 |
# (7) Execute "local" rules. (OPTIONAL). #
|
|
|
66ebb3 |
diff -up ./nss/lib/libpkix/pkix/checker/Makefile.iquote ./nss/lib/libpkix/pkix/checker/Makefile
|
|
|
1b6f66 |
--- ./nss/lib/libpkix/pkix/checker/Makefile.iquote 2015-11-08 21:12:59.000000000 -0800
|
|
|
1b6f66 |
+++ ./nss/lib/libpkix/pkix/checker/Makefile 2016-02-06 08:05:24.277342263 -0800
|
|
|
66ebb3 |
@@ -38,7 +38,8 @@ include $(CORE_DEPTH)/coreconf/rules.mk
|
|
|
66ebb3 |
# (6) Execute "component" rules. (OPTIONAL) #
|
|
|
66ebb3 |
#######################################################################
|
|
|
66ebb3 |
|
|
|
66ebb3 |
-
|
|
|
66ebb3 |
+INCLUDES += -iquote $(DIST)/../private/nss
|
|
|
1b6f66 |
+INCLUDES += -iquote $(DIST)/../public/nss
|
|
|
66ebb3 |
|
|
|
66ebb3 |
#######################################################################
|
|
|
66ebb3 |
# (7) Execute "local" rules. (OPTIONAL). #
|
|
|
66ebb3 |
diff -up ./nss/lib/nss/Makefile.iquote ./nss/lib/nss/Makefile
|
|
|
1b6f66 |
--- ./nss/lib/nss/Makefile.iquote 2015-11-08 21:12:59.000000000 -0800
|
|
|
1b6f66 |
+++ ./nss/lib/nss/Makefile 2016-02-06 08:00:39.404191687 -0800
|
|
|
66ebb3 |
@@ -37,7 +37,8 @@ include $(CORE_DEPTH)/coreconf/rules.mk
|
|
|
66ebb3 |
# (6) Execute "component" rules. (OPTIONAL) #
|
|
|
66ebb3 |
#######################################################################
|
|
|
66ebb3 |
|
|
|
66ebb3 |
-
|
|
|
66ebb3 |
+INCLUDES += -iquote $(DIST)/../public/nss
|
|
|
66ebb3 |
+INCLUDES += -iquote $(DIST)/../private/nss
|
|
|
66ebb3 |
|
|
|
66ebb3 |
#######################################################################
|
|
|
66ebb3 |
# (7) Execute "local" rules. (OPTIONAL). #
|
|
|
054978 |
diff -up ./nss/lib/ssl/Makefile.iquote ./nss/lib/ssl/Makefile
|
|
|
1b6f66 |
--- ./nss/lib/ssl/Makefile.iquote 2015-11-08 21:12:59.000000000 -0800
|
|
|
1b6f66 |
+++ ./nss/lib/ssl/Makefile 2016-02-06 08:00:39.404191687 -0800
|
|
|
054978 |
@@ -49,6 +49,7 @@ include $(CORE_DEPTH)/coreconf/rules.mk
|
|
|
054978 |
# (6) Execute "component" rules. (OPTIONAL) #
|
|
|
054978 |
#######################################################################
|
|
|
054978 |
|
|
|
054978 |
+INCLUDES += -iquote $(DIST)/../public/nss
|
|
|
054978 |
|
|
|
054978 |
|
|
|
054978 |
#######################################################################
|
|
|
1b6f66 |
diff -up ./nss/external_tests/ssl_gtest/Makefile.iquote ./nss/external_tests/ssl_gtest/Makefile
|
|
|
1b6f66 |
--- ./nss/external_tests/ssl_gtest/Makefile.iquote 2016-02-18 21:51:23.746893964 -0500
|
|
|
1b6f66 |
+++ ./nss/external_tests/ssl_gtest/Makefile 2016-02-18 21:52:32.825583479 -0500
|
|
|
1b6f66 |
@@ -37,6 +37,8 @@ include $(CORE_DEPTH)/coreconf/rules.mk
|
|
|
1b6f66 |
# (6) Execute "component" rules. (OPTIONAL) #
|
|
|
1b6f66 |
#######################################################################
|
|
|
1b6f66 |
|
|
|
1b6f66 |
+INCLUDES += -iquote $(DIST)/../public/nss
|
|
|
1b6f66 |
+INCLUDES += -iquote $(DIST)/../private/nss
|
|
|
1b6f66 |
|
|
|
1b6f66 |
#######################################################################
|
|
|
1b6f66 |
# (7) Execute "local" rules. (OPTIONAL). #
|