diff options
Diffstat (limited to 'nss/makefile.mk')
| -rw-r--r-- | nss/makefile.mk | 58 |
1 files changed, 29 insertions, 29 deletions
diff --git a/nss/makefile.mk b/nss/makefile.mk index 78de2a9afbf3..22b126a43c57 100644 --- a/nss/makefile.mk +++ b/nss/makefile.mk @@ -41,9 +41,9 @@ all: @echo "NSS will not be built. ENABLE_NSS_MODULE is '$(ENABLE_NSS_MODULE)'" .ENDIF -TARFILE_NAME=nss_3_12_5 -TARFILE_MD5=6244eb0b6e2647ee50470951fa6efb47 -TARFILE_ROOTDIR=mozilla +TARFILE_NAME=nss-3.12.6-with-nspr-4.8.4 +TARFILE_MD5=b92261a5679276c400555004937af965 +TARFILE_ROOTDIR=nss-3.12.6 PATCH_FILES=nss.patch .IF "$(OS)"=="MACOSX" @@ -83,9 +83,9 @@ MACOS_SDK_DIR*=$(MACDEVSDK) .ENDIF # "$(EXTRA_CFLAGS)"!="" .ENDIF # "$(OS)"=="MACOSX" -OUT2LIB=dist$/out$/lib$/*$(DLLPOST) +OUT2LIB=mozilla$/dist$/out$/lib$/*$(DLLPOST) -BUILD_DIR=security$/nss +BUILD_DIR=mozilla$/security$/nss BUILD_ACTION= $(GNUMAKE) nss_build_all #See #i105566# && moz#513024# .IF "$(OS)"=="LINUX" @@ -117,20 +117,20 @@ nss_LIBS+=-lstdc++_s .ENDIF -BUILD_DIR=security$/nss +BUILD_DIR=mozilla$/security$/nss BUILD_ACTION=NS_USE_GCC=1 CC="$(nss_CC)" CXX="$(nss_CXX)" OS_LIBS="$(nss_LIBS)" OS_TARGET=WIN95 _WIN32_IE=0x500 PATH="$(PATH)" DEFINES=-D_WIN32_IE=0x500 $(GNUMAKE) nss_build_all OUT2LIB= \ - dist$/out$/lib$/libnspr4.a \ - dist$/out$/lib$/libnss3.a \ - dist$/out$/lib$/libnssdbm3.a \ - dist$/out$/lib$/libnssutil3.a \ - dist$/out$/lib$/libplc4.a \ - dist$/out$/lib$/libplds4.a \ - dist$/out$/lib$/libsmime3.a \ - dist$/out$/lib$/libsoftokn3.a \ - dist$/out$/lib$/libsqlite3.a \ - dist$/out$/lib$/libssl3.a + mozilla$/dist$/out$/lib$/libnspr4.a \ + mozilla$/dist$/out$/lib$/libnss3.a \ + mozilla$/dist$/out$/lib$/libnssdbm3.a \ + mozilla$/dist$/out$/lib$/libnssutil3.a \ + mozilla$/dist$/out$/lib$/libplc4.a \ + mozilla$/dist$/out$/lib$/libplds4.a \ + mozilla$/dist$/out$/lib$/libsmime3.a \ + mozilla$/dist$/out$/lib$/libsoftokn3.a \ + mozilla$/dist$/out$/lib$/libsqlite3.a \ + mozilla$/dist$/out$/lib$/libssl3.a .ELSE # "$(COM)"=="GCC" MOZ_MSVCVERSION= 9 @@ -151,29 +151,29 @@ EXT_USE_STLPORT=TRUE #To build nss one has to call "make nss_build_all" in #mozilla/security/nss -NSS_BUILD_DIR= $(subst,\,/ $(PWD)/$(MISC)/build/mozilla/security/nss) +NSS_BUILD_DIR= $(subst,\,/ $(PWD)/$(MISC)/build/$(TARFILE_ROOTDIR)/mozilla/security/nss) BUILD_ACTION= $(subst,/,$/ $(MOZILLABUILD)/msys/bin/bash) -i \ -c "cd $(NSS_BUILD_DIR) && make nss_build_all" OUT2LIB= \ - dist$/out$/lib$/nspr4.lib \ - dist$/out$/lib$/nss3.lib \ - dist$/out$/lib$/nssdbm3.lib \ - dist$/out$/lib$/nssutil3.lib \ - dist$/out$/lib$/plc4.lib \ - dist$/out$/lib$/plds4.lib \ - dist$/out$/lib$/smime3.lib \ - dist$/out$/lib$/softokn3.lib \ - dist$/out$/lib$/sqlite3.lib \ - dist$/out$/lib$/ssl3.lib + mozilla$/dist$/out$/lib$/nspr4.lib \ + mozilla$/dist$/out$/lib$/nss3.lib \ + mozilla$/dist$/out$/lib$/nssdbm3.lib \ + mozilla$/dist$/out$/lib$/nssutil3.lib \ + mozilla$/dist$/out$/lib$/plc4.lib \ + mozilla$/dist$/out$/lib$/plds4.lib \ + mozilla$/dist$/out$/lib$/smime3.lib \ + mozilla$/dist$/out$/lib$/softokn3.lib \ + mozilla$/dist$/out$/lib$/sqlite3.lib \ + mozilla$/dist$/out$/lib$/ssl3.lib .ENDIF # "$(COM)"=="GCC" -OUT2BIN=dist$/out$/lib$/*$(DLLPOST) +OUT2BIN=mozilla$/dist$/out$/lib$/*$(DLLPOST) .ENDIF # "$(GUI)"=="WNT" -OUTDIR2INC=dist$/public$/nss dist$/out$/include +OUTDIR2INC=mozilla$/dist$/public$/nss mozilla$/dist$/out$/include # --- Targets ------------------------------------------------------ |