Bug 403994 - "Don't install nss headers when system-nss is used" [p=fta+bugzilla@sofaraway.org (Fabien Tassin) r=rrelyea a1.9=schrep]
authorreed@reedloden.com
Tue, 20 Nov 2007 02:05:41 -0800
changeset 8214 4dab086ec10decdd8b327884548612dabf9dc1d7
parent 8213 e2262636c929bd955d3279fd570bb9fa69e205cc
child 8215 85032629c05551cefb6cc4509b59c1882db362e0
push idunknown
push userunknown
push dateunknown
reviewersrrelyea
bugs403994
milestone1.9b2pre
Bug 403994 - "Don't install nss headers when system-nss is used" [p=fta+bugzilla@sofaraway.org (Fabien Tassin) r=rrelyea a1.9=schrep]
security/manager/Makefile.in
--- a/security/manager/Makefile.in
+++ b/security/manager/Makefile.in
@@ -289,22 +289,24 @@ 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
+ifndef MOZ_NATIVE_NSS
 # 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 -)
+endif
 	$(MAKE) -C boot $@
 	$(MAKE) -C ssl $@
 	$(MAKE) -C locales $@
 ifdef MOZ_XUL
 	$(MAKE) -C pki $@
 endif
 
 check::