← Back to branch summary

~ubuntu-branches/ubuntu/quantal/nss/quantal-updates

« back to all changes in this revision

Viewing changes to mozilla/security/coreconf/location.mk

  • Committer: Bazaar Package Importer
  • Author(s): Chris Coulson
  • Date: 2010-03-25 13:46:06 UTC
  • mfrom: (1.1.11 upstream)
  • Revision ID: james.westby@ubuntu.com-20100325134606-bl6liuok2w9l7snv
Tags: 3.12.6-0ubuntu1
* New upstream release 3.12.6 RTM (NSS_3_12_6_RTM)
  - fixes CVE-2009-3555 aka US-CERT VU#120541
* Adjust patches to changed upstream code base
  - update debian/patches/38_kbsd.patch
  - update debian/patches/38_mips64_build.patch
  - update debian/patches/85_security_load.patch
* Remove patches that are merged upstream
  - delete debian/patches/91_nonexec_stack.patch
  - update debian/patches/series
* Bump nspr dependency to 4.8
  - update debian/control
* Add new symbols for 3.12.6
  - update debian/libnss3-1d.symbols

Show diffs side-by-side

added added

removed removed

Lines of Context:
mozilla/security/coreconf/location.mk
83
83
    NSS_LIB_DIR = $(DIST)/lib
84
84
endif
85
85
 
 
86
ifdef NSSUTIL_INCLUDE_DIR
 
87
    INCLUDES += -I$(NSSUTIL_INCLUDE_DIR)
 
88
endif
 
89
 
 
90
ifndef NSSUTIL_LIB_DIR
 
91
    NSSUTIL_LIB_DIR = $(DIST)/lib
 
92
endif
 
93
 
 
94
ifdef SOFTOKEN_INCLUDE_DIR
 
95
    INCLUDES += -I$(SOFTOKEN_INCLUDE_DIR)
 
96
endif
 
97
 
 
98
ifndef SOFTOKEN_LIB_DIR
 
99
    SOFTOKEN_LIB_DIR = $(DIST)/lib
 
100
endif
 
101
 
86
102
MK_LOCATION = included