Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use NSPR 4.2.2 RC1 and NSS 3.6 Beta1. Starting in NSS 3.6 Beta1, NSS

Browse Source 
headers are installed in the 'nss' subdirectory instead of the 'security'
subdirectory.  (blackflag bug 610683)
Tag: PHT_2002_08_08_BRANCH


git-svn-id: svn://10.0.0.236/branches/PHT_2002_08_08_BRANCH@130013 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
wtc%netscape.com
2002-09-19 04:58:27 +00:00
parent 6d69dfb32b
commit d12bb50671
6 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
mozilla/client.mak
View File

@@ -41,9 +41,9 @@ MOZ_OBJDIR = WIN32_O.OBJ
#//------------------------------------------------------------------------
# uncomment these, modify branch tag, and check in to branch for milestones
MOZ_BRANCH=PHT_2002_08_08_BRANCH
NSPR_CO_TAG=PHT_2002_08_08_BRANCH
NSPR_CO_TAG=NSPR_4_2_2_RC1
PSM_CO_TAG=PHT_2002_08_08_BRANCH
NSS_CO_TAG=NSS_MULTIACCESS_DB_TAG
NSS_CO_TAG=NSS_3_6_BETA1
LDAPCSDK_CO_TAG=PHT_2002_08_08_BRANCH
ACCESSIBLE_CO_TAG=PHT_2002_08_08_BRANCH
IMGLIB2_CO_TAG=PHT_2002_08_08_BRANCH
@@ -99,8 +99,11 @@ CVSCO = cvs $(CVS_FLAGS) co $(MOZ_CO_FLAGS) $(CVS_BRANCH)
NSPR_CO_FLAGS=$(MOZ_CO_FLAGS)
!endif
NSPR_CO_FLAGS=$(NSPR_CO_FLAGS) $(CVS_BRANCH)
!if "$(NSPR_CO_TAG)" != ""
NSPR_CO_FLAGS=$(NSPR_CO_FLAGS) -r $(NSPR_CO_TAG)
!else
NSPR_CO_FLAGS=$(NSPR_CO_FLAGS) -r NSPRPUB_PRE_4_2_CLIENT_BRANCH
!endif
CVSCO_NSPR = cvs $(CVS_FLAGS) co $(NSPR_CO_FLAGS)

4
mozilla/client.mk
View File

@@ -53,9 +53,9 @@
# For branches, uncomment the MOZ_CO_TAG line with the proper tag,
# and commit this file on that tag.
MOZ_CO_TAG = PHT_2002_08_08_BRANCH
NSPR_CO_TAG = PHT_2002_08_08_BRANCH
NSPR_CO_TAG = NSPR_4_2_2_RC1
PSM_CO_TAG = PHT_2002_08_08_BRANCH
NSS_CO_TAG = NSS_MULTIACCESS_DB_TAG
NSS_CO_TAG = NSS_3_6_BETA1
LDAPCSDK_CO_TAG = PHT_2002_08_08_BRANCH
ACCESSIBLE_CO_TAG = PHT_2002_08_08_BRANCH
GFX2_CO_TAG = PHT_2002_08_08_BRANCH

2
mozilla/security/manager/boot/src/Makefile.in
View File

@@ -80,7 +80,7 @@ REQUIRES = nspr \
include $(topsrcdir)/config/rules.mk
INCLUDES += \
-I$(DIST)/public/security \
-I$(DIST)/public/nss \
$(NULL)
EXTRA_DSO_LDOPTS += \

2
mozilla/security/manager/pki/src/Makefile.in
View File

@@ -72,7 +72,7 @@ REQUIRES = nspr \
include $(topsrcdir)/config/rules.mk
INCLUDES += \
-I$(DIST)/public/security \
-I$(DIST)/public/nss \
$(NULL)
EXTRA_DSO_LDOPTS += \

4
mozilla/security/manager/ssl/src/Makefile.in
View File

@@ -105,8 +105,8 @@ include $(topsrcdir)/config/rules.mk
# Use local includes because they are inserted before INCLUDES
# so that Mozilla's nss.h is used, not glibc's
LOCAL_INCLUDES += -I$(DIST)/public/security \
-I$(DIST)/private/security \
LOCAL_INCLUDES += -I$(DIST)/public/nss \
-I$(DIST)/private/nss \
$(NULL)
EXTRA_DSO_LDOPTS += \

4
mozilla/security/manager/ssl/src/makefile.win
View File

@@ -80,8 +80,8 @@ CFLAGS = $(CFLAGS) -DNSS_USE_STATIC_LIBS
!endif
LINCS = $(LINCS) \
-I$(XPDIST)/public/security \
-I$(XPDIST)/private/security \
-I$(XPDIST)/public/nss \
-I$(XPDIST)/private/nss \
$(NULL)