diff options
| author | Mike Hommey <mh+mozilla@glandium.org> | 2015-03-03 17:07:53 +0900 |
|---|---|---|
| committer | Mike Hommey <mh+mozilla@glandium.org> | 2015-03-03 17:07:53 +0900 |
| commit | 7ec0387368b4cc1da923f8c217a053aa3163d42a (patch) | |
| tree | 338365b43aaa07026138099c79bffa253a09fee9 /cmd/platlibs.mk | |
| parent | dcb66af89dabce1165544fc4b52f0c3b113eec23 (diff) | |
| download | nss-hg-7ec0387368b4cc1da923f8c217a053aa3163d42a.tar.gz | |
Bug 1138820 - Allow to override sqlite library location, At the same time, fix a couple paths to use NSSUTIL_LIB_DIR, r=kaie
---
cmd/platlibs.mk | 8 ++++----
coreconf/location.mk | 4 ++++
lib/softoken/config.mk | 6 +++---
3 files changed, 11 insertions(+), 7 deletions(-)
Diffstat (limited to 'cmd/platlibs.mk')
| -rw-r--r-- | cmd/platlibs.mk | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/cmd/platlibs.mk b/cmd/platlibs.mk index 833952a5a..812a27fdc 100644 --- a/cmd/platlibs.mk +++ b/cmd/platlibs.mk @@ -87,8 +87,8 @@ EXTRA_LIBS += \ $(DIST)/lib/$(LIB_PREFIX)nssb.$(LIB_SUFFIX) \ $(PKIXLIB) \ $(DBMLIB) \ - $(DIST)/lib/$(LIB_PREFIX)$(SQLITE_LIB_NAME).$(LIB_SUFFIX) \ - $(DIST)/lib/$(LIB_PREFIX)nssutil3.$(LIB_SUFFIX) \ + $(SQLITE_LIB_DIR)/$(LIB_PREFIX)$(SQLITE_LIB_NAME).$(LIB_SUFFIX) \ + $(NSSUTIL_LIB_DIR)/$(LIB_PREFIX)nssutil3.$(LIB_SUFFIX) \ $(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)plc4.$(LIB_SUFFIX) \ $(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)plds4.$(LIB_SUFFIX) \ $(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)nspr4.$(LIB_SUFFIX) \ @@ -135,7 +135,7 @@ endif # $(PROGRAM) has NO explicit dependencies on $(EXTRA_SHARED_LIBS) # $(EXTRA_SHARED_LIBS) come before $(OS_LIBS), except on AIX. EXTRA_SHARED_LIBS += \ - -L$(DIST)/lib \ + -L$(SQLITE_LIB_DIR) \ -l$(SQLITE_LIB_NAME) \ -L$(NSSUTIL_LIB_DIR) \ -lnssutil3 \ @@ -153,7 +153,7 @@ ifeq ($(OS_ARCH), WINNT) # $(PROGRAM) has explicit dependencies on $(EXTRA_LIBS) EXTRA_LIBS += \ $(DIST)/lib/$(LIB_PREFIX)sectool.$(LIB_SUFFIX) \ - $(DIST)/lib/$(IMPORT_LIB_PREFIX)nssutil3$(IMPORT_LIB_SUFFIX) \ + $(NSSUTIL_LIB_DIR)/$(IMPORT_LIB_PREFIX)nssutil3$(IMPORT_LIB_SUFFIX) \ $(DIST)/lib/$(IMPORT_LIB_PREFIX)smime3$(IMPORT_LIB_SUFFIX) \ $(DIST)/lib/$(IMPORT_LIB_PREFIX)ssl3$(IMPORT_LIB_SUFFIX) \ $(DIST)/lib/$(IMPORT_LIB_PREFIX)nss3$(IMPORT_LIB_SUFFIX) \ |