Bug 389872 - Install NSS headers to dist/include, r=luser and a=blocks approved bug 389673
authorbenjamin@smedbergs.us
Fri, 03 Aug 2007 07:04:33 -0700
changeset 4233 3b69d08fefd1033153fe104dc38cda48b004251d
parent 4232 0eb45e65f6a7c1a791101db43fce6ffe951b0959
child 4234 1a4839a1d2db983136fdd29d1b308639ce6ec08c
push idunknown
push userunknown
push dateunknown
reviewersluser, blocks
bugs389872, 389673
milestone1.9a7pre
Bug 389872 - Install NSS headers to dist/include, r=luser and a=blocks approved bug 389673
configure.in
security/manager/Makefile.in
--- a/configure.in
+++ b/configure.in
@@ -3868,17 +3868,17 @@ MOZ_ARG_WITH_BOOL(system-nss,
 
 if test -n "$_USE_SYSTEM_NSS"; then
     AM_PATH_NSS(3.0.0, [MOZ_NATIVE_NSS=1], [MOZ_NATIVE_NSS=])
 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) \\\
         $(LIBXUL_DIST)/lib/$(DLL_PREFIX)ssl'$NSS_VERSION'$(DLL_SUFFIX) \\\
         $(LIBXUL_DIST)/lib/$(DLL_PREFIX)nss'$NSS_VERSION'$(DLL_SUFFIX) \\\
         $(LIBXUL_DIST)/lib/$(DLL_PREFIX)softokn'$NSS_VERSION'$(DLL_SUFFIX)'
 
    if test -z "$GNU_CC" && test "$OS_ARCH" = "WINNT" -o "$OS_ARCH" = "WINCE" -o "$OS_ARCH" = "OS2"; then
--- a/security/manager/Makefile.in
+++ b/security/manager/Makefile.in
@@ -289,16 +289,22 @@ ifdef HAVE_FREEBL_LIBS_64
 ifndef SKIP_CHK
 	$(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_64INT_CHK) $(DIST)/bin
 	$(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_64FPU_CHK) $(DIST)/bin
 endif
 	$(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_64INT_LIB) $(DIST)/bin
 	$(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 $@
 ifdef MOZ_XUL
 	$(MAKE) -C pki $@
 endif
 
 install::