diff options
| author | cls%seawood.org <devnull@localhost> | 2001-06-17 00:29:21 +0000 |
|---|---|---|
| committer | cls%seawood.org <devnull@localhost> | 2001-06-17 00:29:21 +0000 |
| commit | 57513ccdfc8564134ac6d6d8f2a5512229cec245 (patch) | |
| tree | 05f245afc396b703d1eee14eba1dcbd0cf6a7a3e | |
| parent | 8343b9bd619c1c528faeb7b951286abf277988ff (diff) | |
| download | nss-hg-57513ccdfc8564134ac6d6d8f2a5512229cec245.tar.gz | |
Make NSS libs include the version number in the name of static libs as they do with shared libs. Bug #86254
| -rw-r--r-- | security/coreconf/ruleset.mk | 2 | ||||
| -rw-r--r-- | security/nss/lib/fortcrypt/swfort/pkcs11/Makefile | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/security/coreconf/ruleset.mk b/security/coreconf/ruleset.mk index 6ddb78636..38a10d765 100644 --- a/security/coreconf/ruleset.mk +++ b/security/coreconf/ruleset.mk @@ -165,7 +165,7 @@ ifdef LIBRARY_NAME SHARED_LIBRARY = $(OBJDIR)/$(LIBRARY_NAME)$(LIBRARY_VERSION)$(JDK_DEBUG_SUFFIX).dll IMPORT_LIBRARY = $(OBJDIR)/$(LIBRARY_NAME)$(LIBRARY_VERSION)$(JDK_DEBUG_SUFFIX).lib else - LIBRARY = $(OBJDIR)/lib$(LIBRARY_NAME).$(LIB_SUFFIX) + LIBRARY = $(OBJDIR)/lib$(LIBRARY_NAME)$(LIBRARY_VERSION).$(LIB_SUFFIX) ifeq ($(OS_ARCH)$(OS_RELEASE), AIX4.1) SHARED_LIBRARY = $(OBJDIR)/lib$(LIBRARY_NAME)$(LIBRARY_VERSION)_shr$(JDK_DEBUG_SUFFIX).a else diff --git a/security/nss/lib/fortcrypt/swfort/pkcs11/Makefile b/security/nss/lib/fortcrypt/swfort/pkcs11/Makefile index fff915e74..53cf2fdb4 100644 --- a/security/nss/lib/fortcrypt/swfort/pkcs11/Makefile +++ b/security/nss/lib/fortcrypt/swfort/pkcs11/Makefile @@ -69,14 +69,14 @@ else # $(DIST)/lib/libdbm.a # $(DIST)/lib/libnspr3.a # -CRYPTO_LIB = $(DIST)/lib/libfreebl.$(LIB_SUFFIX) +CRYPTO_LIB = $(DIST)/lib/libfreebl_3.$(LIB_SUFFIX) ifdef MOZILLA_SECURITY_BUILD CRYPTO_LIB = $(DIST)/lib/libcrypto.$(LIB_SUFFIX) endif ifdef MOZILLA_BSAFE_BUILD CRYPTO_LIB += $(DIST)/lib/libbsafe.$(LIB_SUFFIX) -CRYPTO_LIB += $(DIST)/lib/libfreebl.$(LIB_SUFFIX) +CRYPTO_LIB += $(DIST)/lib/libfreebl_3.$(LIB_SUFFIX) endif ifeq ($(OS_ARCH), OS2) |