|
 |
dcddc0 |
diff -up nss/cmd/bltest/Makefile.iquote nss/cmd/bltest/Makefile
|
|
|
dcddc0 |
--- nss/cmd/bltest/Makefile.iquote 2013-04-04 21:56:59.329249213 -0700
|
|
|
dcddc0 |
+++ nss/cmd/bltest/Makefile 2013-04-04 21:57:47.583579084 -0700
|
|
|
dcddc0 |
@@ -45,6 +45,7 @@ include $(CORE_DEPTH)/coreconf/rules.mk
|
|
|
dcddc0 |
# (6) Execute "component" rules. (OPTIONAL) #
|
|
|
dcddc0 |
#######################################################################
|
|
|
dcddc0 |
|
|
|
dcddc0 |
+INCLUDES += -iquote $(DIST)/../private/nss
|
|
|
dcddc0 |
|
|
|
dcddc0 |
|
|
|
dcddc0 |
#######################################################################
|
|
|
dcddc0 |
diff -up nss/coreconf/location.mk.iquote nss/coreconf/location.mk
|
|
|
dcddc0 |
--- nss/coreconf/location.mk.iquote 2013-04-04 21:54:59.710477106 -0700
|
|
|
dcddc0 |
+++ nss/coreconf/location.mk 2013-04-04 21:56:21.091163121 -0700
|
|
|
dcddc0 |
@@ -45,6 +45,10 @@ endif
|
|
|
dcddc0 |
|
|
|
dcddc0 |
ifdef NSS_INCLUDE_DIR
|
|
|
dcddc0 |
INCLUDES += -I$(NSS_INCLUDE_DIR)
|
|
|
dcddc0 |
+ ifdef IN_TREE_FREEBL_HEADERS_FIRST
|
|
|
dcddc0 |
+ INCLUDES += -iquote $(DIST)/../public/nss
|
|
|
dcddc0 |
+ INCLUDES += -iquote $(DIST)/../private/nss
|
|
|
dcddc0 |
+ endif
|
|
|
dcddc0 |
endif
|
|
|
dcddc0 |
|
|
|
dcddc0 |
ifndef NSS_LIB_DIR
|
|
|
5297d5 |
diff -up ./nss/lib/softoken/Makefile.iquote ./nss/lib/softoken/Makefile
|
|
|
5297d5 |
--- ./nss/lib/softoken/Makefile.iquote 2014-01-06 20:35:19.931937299 -0800
|
|
|
5297d5 |
+++ ./nss/lib/softoken/Makefile 2014-01-06 20:36:15.336390664 -0800
|
|
|
5297d5 |
@@ -42,6 +42,8 @@ ifdef NSS_DISABLE_DBM
|
|
|
5297d5 |
DIRS=
|
|
|
5297d5 |
endif
|
|
|
5297d5 |
|
|
|
5297d5 |
+INCLUDES += -iquote $(DIST)/../private/nss
|
|
|
5297d5 |
+
|
|
|
5297d5 |
#######################################################################
|
|
|
5297d5 |
# (7) Execute "local" rules. (OPTIONAL). #
|
|
|
5297d5 |
#######################################################################
|