Bug 389872 - Install NSS headers to dist/include, r=luser and a=blocks approved bug 389673

configure.in

@@ -3873,7 +3873,7 @@ fi
 if test -n "$MOZ_NATIVE_NSS"; then
    NSS_LIBS="$NSS_LIBS -lcrmf"
 else
-   NSS_CFLAGS='-I$(LIBXUL_DIST)/public/nss'
+   NSS_CFLAGS='-I$(LIBXUL_DIST)/include/nss'
    NSS_DEP_LIBS='\\\
         $(LIBXUL_DIST)/lib/$(LIB_PREFIX)crmf.$(LIB_SUFFIX) \\\
         $(LIBXUL_DIST)/lib/$(DLL_PREFIX)smime'$NSS_VERSION'$(DLL_SUFFIX) \\\

security/manager/Makefile.in

@@ -294,6 +294,12 @@ endif
 	$(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_64FPU_LIB) $(DIST)/bin
 endif
 endif
+# NSS installs headers to dist/public and we want them in dist/include
+	$(NSINSTALL) -D $(DIST)/include/nss
+	(cd $(DIST)/public/nss && tar $(TAR_CREATE_FLAGS) - .) | \
+	  (cd $(DIST)/include/nss && tar -xf -)
+	(cd $(DIST)/public/nss && tar $(TAR_CREATE_FLAGS) - .) | \
+	  (cd $(DIST)/sdk/include && tar -xf -)
 	$(MAKE) -C boot $@
 	$(MAKE) -C ssl $@
 	$(MAKE) -C locales $@