--- set_soenv.in~	2014-01-22 15:21:04.000000000 +0900
+++ set_soenv.in	2014-02-03 12:12:03.000000000 +0900
@@ -1864,6 +1864,8 @@
 ToFile( "SYSTEM_STDLIBS",    "@SYSTEM_STDLIBS@",   "e" );
 ToFile( "SYSTEM_ZLIB",       "@SYSTEM_ZLIB@",      "e" );
 ToFile( "SYSTEM_NSS",        "@SYSTEM_NSS@",       "e" );
+ToFile( "NSS_CFLAGS",        "@NSS_CFLAGS@",       "e" );
+ToFile( "NSS_LIBS",          "@NSS_LIBS@",         "e" );
 ToFile( "SYSTEM_OPENSSL",    "@SYSTEM_OPENSSL@",   "e" );
 ToFile( "OPENSSL_CFLAGS",    "@OPENSSL_CFLAGS@",   "e" );
 ToFile( "OPENSSL_LIBS",      "@OPENSSL_LIBS@",     "e" );

--- xmlsecurity/util/makefile.mk	2014-02-03 15:50:50.000000000 +0900
+++ xmlsecurity/util/makefile.mk	2014-02-03 16:03:11.000000000 +0900
@@ -98,12 +98,12 @@
 SHL2STDLIBS +=-ldl
 .ENDIF
 
-.IF "$(ENABLE_NSS_MODULE)"=="YES" && "$(SYSTEM_NSS)"!="YES"
+.IF "$(ENABLE_NSS_MODULE)"=="YES" && "$(SYSTEM_NSS)"=="YES"
 .IF "$(NSPR_LIB)" != ""
 SHL2STDLIBS += $(NSPR_LIB)
 .ENDIF
-.IF "$(NSS_LIB)" != ""
-SHL2STDLIBS += $(NSS_LIB)
+.IF "$(NSS_LIBS)" != ""
+SHL2STDLIBS += $(NSS_LIBS)
 .ENDIF
 .ENDIF
 
--- xmlsecurity/source/xmlsec/nss/makefile.mk	2014-01-22 15:07:16.000000000 +0900
+++ xmlsecurity/source/xmlsec/nss/makefile.mk	2014-02-03 16:13:30.000000000 +0900
@@ -48,8 +48,8 @@
 NSPR_INC = $(MOZ_INC)$/nspr
 .ELSE
 # TODO: better use pkgconfig to find the proper system include path
-NSS_INC = /usr/include/nss3
-NSPR_INC = /usr/include/nspr4
+NSS_INC = $(NSS_CFLAGS)
+NSPR_INC = $(NSS_CFLAGS)
 .ENDIF
 
 .IF "$(GUI)" == "WNT"