|
 |
66ebb3 |
diff -up ./nss/cmd/bltest/Makefile.iquote ./nss/cmd/bltest/Makefile
|
|
|
66ebb3 |
--- ./nss/cmd/bltest/Makefile.iquote 2014-01-03 11:59:10.000000000 -0800
|
|
|
66ebb3 |
+++ ./nss/cmd/bltest/Makefile 2014-01-18 11:31:32.277404478 -0800
|
|
|
f57139 |
@@ -45,6 +45,7 @@ include $(CORE_DEPTH)/coreconf/rules.mk
|
|
|
f57139 |
# (6) Execute "component" rules. (OPTIONAL) #
|
|
|
f57139 |
#######################################################################
|
|
|
f57139 |
|
|
|
f57139 |
+INCLUDES += -iquote $(DIST)/../private/nss
|
|
|
f57139 |
|
|
|
f57139 |
|
|
|
f57139 |
#######################################################################
|
|
|
66ebb3 |
diff -up ./nss/cmd/httpserv/Makefile.iquote ./nss/cmd/httpserv/Makefile
|
|
|
66ebb3 |
--- ./nss/cmd/httpserv/Makefile.iquote 2014-01-18 11:33:15.058108851 -0800
|
|
|
66ebb3 |
+++ ./nss/cmd/httpserv/Makefile 2014-01-18 11:34:08.913478276 -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
|
|
|
66ebb3 |
--- ./nss/cmd/lib/Makefile.iquote 2014-01-03 11:59:10.000000000 -0800
|
|
|
66ebb3 |
+++ ./nss/cmd/lib/Makefile 2014-01-18 11:31:32.309404697 -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). #
|
|
|
66ebb3 |
diff -up ./nss/coreconf/location.mk.iquote ./nss/coreconf/location.mk
|
|
|
66ebb3 |
--- ./nss/coreconf/location.mk.iquote 2014-01-03 11:59:10.000000000 -0800
|
|
|
66ebb3 |
+++ ./nss/coreconf/location.mk 2014-01-18 11:31:32.309404697 -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
|
|
|
66ebb3 |
--- ./nss/lib/certhigh/Makefile.iquote 2014-01-03 11:59:10.000000000 -0800
|
|
|
66ebb3 |
+++ ./nss/lib/certhigh/Makefile 2014-01-18 11:31:32.310404704 -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
|
|
|
66ebb3 |
--- ./nss/lib/cryptohi/Makefile.iquote 2014-01-03 11:59:10.000000000 -0800
|
|
|
66ebb3 |
+++ ./nss/lib/cryptohi/Makefile 2014-01-18 11:31:32.310404704 -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
|
|
|
66ebb3 |
--- ./nss/lib/libpkix/pkix/checker/Makefile.iquote 2014-01-03 11:59:10.000000000 -0800
|
|
|
66ebb3 |
+++ ./nss/lib/libpkix/pkix/checker/Makefile 2014-01-18 11:31:32.310404704 -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)/../public/nss
|
|
|
66ebb3 |
+INCLUDES += -iquote $(DIST)/../private/nss
|
|
|
66ebb3 |
|
|
|
66ebb3 |
#######################################################################
|
|
|
66ebb3 |
# (7) Execute "local" rules. (OPTIONAL). #
|
|
|
66ebb3 |
diff -up ./nss/lib/nss/Makefile.iquote ./nss/lib/nss/Makefile
|
|
|
66ebb3 |
--- ./nss/lib/nss/Makefile.iquote 2014-01-03 11:59:10.000000000 -0800
|
|
|
66ebb3 |
+++ ./nss/lib/nss/Makefile 2014-01-18 11:31:32.310404704 -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). #
|