diff options
-rw-r--r-- | security/coreconf/autoconf.mk.in | 17 | ||||
-rw-r--r-- | security/coreconf/ruleset.mk | 14 | ||||
-rw-r--r-- | security/nss/Makefile.in | 4 | ||||
-rw-r--r-- | security/nss/cmd/modutil/Makefile.in | 2 | ||||
-rw-r--r-- | security/nss/cmd/platlibs.mk | 11 | ||||
-rw-r--r-- | security/nss/lib/ckfw/builtins/Makefile.in | 2 | ||||
-rw-r--r-- | security/nss/lib/fortcrypt/swfort/pkcs11/Makefile.in | 2 | ||||
-rw-r--r-- | security/nss/lib/nss/config.mk | 5 | ||||
-rw-r--r-- | security/nss/lib/smime/config.mk | 4 | ||||
-rw-r--r-- | security/nss/lib/ssl/config.mk | 4 |
10 files changed, 36 insertions, 29 deletions
diff --git a/security/coreconf/autoconf.mk.in b/security/coreconf/autoconf.mk.in index 7d291860c..13c9b6f65 100644 --- a/security/coreconf/autoconf.mk.in +++ b/security/coreconf/autoconf.mk.in @@ -1,6 +1,21 @@ USE_AUTOCONF = 1 NO_MDUPDATE = 1 OBJDIR_NAME = . + +prefix = @prefix@ +exec_prefix = @exec_prefix@ +bindir = @bindir@ +includedir = @includedir@ +libdir = @libdir@ +datadir = @datadir@ + +dist_prefix = @dist_prefix@ +dist_bindir = @dist_bindir@ +dist_includedir = @dist_includedir@ +dist_libdir = @dist_libdir@ + +#DIST = $(dist_prefix) + MOZILLA_CLIENT = @MOZILLA_CLIENT@ ENABLE_CMD = @ENABLE_CMD@ ENABLE_PSM = @ENABLE_PSM@ @@ -46,3 +61,5 @@ OS_LIBS = @OS_LIBS@ RC = @RC@ DLLFLAGS = @DLLFLAGS@ +NSPR_CFLAGS = @NSPR_CFLAGS@ +NSPR_LIBS = @NSPR_LIBS@ diff --git a/security/coreconf/ruleset.mk b/security/coreconf/ruleset.mk index b8764c8da..2914051a9 100644 --- a/security/coreconf/ruleset.mk +++ b/security/coreconf/ruleset.mk @@ -254,16 +254,10 @@ else JDK_STUB_DIR = _stubs endif -# -# If this is an "official" build, try to build everything. -# I.e., don't exit on errors. -# - +EXIT_ON_ERROR = -e ifdef BUILD_OFFICIAL - EXIT_ON_ERROR = +e CLICK_STOPWATCH = date else - EXIT_ON_ERROR = -e CLICK_STOPWATCH = true endif @@ -280,6 +274,12 @@ else endif endif +ifdef NSPR_CFLAGS +INCLUDES += $(NSPR_CFLAGS) +else +INCLUDES += -I$(SYSTEM_XP_DIR)/include/nspr +endif + ifdef SYSTEM_INCL_DIR YOPT = -Y$(SYSTEM_INCL_DIR) endif diff --git a/security/nss/Makefile.in b/security/nss/Makefile.in index 9ded8f17e..7bef42ed7 100644 --- a/security/nss/Makefile.in +++ b/security/nss/Makefile.in @@ -106,7 +106,9 @@ ifeq ($(OS_ARCH),OS2) cp -rf $(DIST)/../lib $(DIST) cp -f $(DIST)/lib/libmozdbm_s.$(LIB_SUFFIX) $(DIST)/lib/libdbm.$(LIB_SUFFIX) else - cp -du $(DIST)/lib/libmozdbm_s.a $(DIST)/lib/libdbm.$(LIB_SUFFIX) + if [ ! -f $(DIST)/lib/libdbm.$(LIB_SUFFIX) ]; then \ + cp -du $(DIST)/lib/libmozdbm_s.a $(DIST)/lib/libdbm.$(LIB_SUFFIX) ; \ + fi endif endif diff --git a/security/nss/cmd/modutil/Makefile.in b/security/nss/cmd/modutil/Makefile.in index 32ce7986d..776725b73 100644 --- a/security/nss/cmd/modutil/Makefile.in +++ b/security/nss/cmd/modutil/Makefile.in @@ -59,6 +59,8 @@ include $(topsrcdir)/coreconf/config.mk # (3) Include "component" configuration information. (OPTIONAL) # ####################################################################### +INCLUDES += -I$(srcdir) + ####################################################################### # (4) Include "local" platform-dependent assignments (OPTIONAL). # ####################################################################### diff --git a/security/nss/cmd/platlibs.mk b/security/nss/cmd/platlibs.mk index 4f486e938..5dd1a6e49 100644 --- a/security/nss/cmd/platlibs.mk +++ b/security/nss/cmd/platlibs.mk @@ -123,12 +123,7 @@ EXTRA_SHARED_LIBS += \ $(DIST)/lib/nspr4.lib \ $(NULL) else -EXTRA_SHARED_LIBS += \ - -L$(DIST)/lib/ \ - -lplc4 \ - -lplds4 \ - -lnspr4 \ - $(NULL) +EXTRA_SHARED_LIBS += $(NSPR_LIBS) endif endif @@ -170,9 +165,7 @@ EXTRA_SHARED_LIBS += \ -lssl3 \ -lsmime3 \ -lnss3 \ - -lplc4 \ - -lplds4 \ - -lnspr4 \ + $(NSPR_LIBS) \ $(NULL) endif diff --git a/security/nss/lib/ckfw/builtins/Makefile.in b/security/nss/lib/ckfw/builtins/Makefile.in index 941336233..2d415f335 100644 --- a/security/nss/lib/ckfw/builtins/Makefile.in +++ b/security/nss/lib/ckfw/builtins/Makefile.in @@ -92,7 +92,7 @@ EXTRA_LIBS += \ $(DIST)/lib/libnssb.a \ $(NULL) -EXTRA_SHARED_LIBS = -L$(DIST)/lib -lplc4 -lplds4 +EXTRA_SHARED_LIBS = $(NSPR_LIBS) endif endif diff --git a/security/nss/lib/fortcrypt/swfort/pkcs11/Makefile.in b/security/nss/lib/fortcrypt/swfort/pkcs11/Makefile.in index a13cbc605..92a33357c 100644 --- a/security/nss/lib/fortcrypt/swfort/pkcs11/Makefile.in +++ b/security/nss/lib/fortcrypt/swfort/pkcs11/Makefile.in @@ -125,7 +125,7 @@ EXTRA_LIBS += \ $(DIST)/lib/libsecutil.$(LIB_SUFFIX) \ $(NULL) -EXTRA_SHARED_LIBS += -L$(DIST)/lib -lplc4 -lplds4 +EXTRA_SHARED_LIBS += $(NSPR_LIBS) endif endif diff --git a/security/nss/lib/nss/config.mk b/security/nss/lib/nss/config.mk index aa35a3775..5eb57de6e 100644 --- a/security/nss/lib/nss/config.mk +++ b/security/nss/lib/nss/config.mk @@ -136,10 +136,7 @@ SHARED_LIBRARY_DIRS = \ # $(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/ \ - -lplc4 \ - -lplds4 \ - -lnspr4 \ + $(NSPR_LIBS) \ $(NULL) endif diff --git a/security/nss/lib/smime/config.mk b/security/nss/lib/smime/config.mk index 2d483a789..6edae0217 100644 --- a/security/nss/lib/smime/config.mk +++ b/security/nss/lib/smime/config.mk @@ -87,9 +87,7 @@ SHARED_LIBRARY_DIRS = \ EXTRA_SHARED_LIBS += \ -L$(DIST)/lib/ \ -lnss3 \ - -lplc4 \ - -lplds4 \ - -lnspr4 \ + $(NSPR_LIBS) \ $(NULL) endif diff --git a/security/nss/lib/ssl/config.mk b/security/nss/lib/ssl/config.mk index 5fffdaa72..ca2907cc2 100644 --- a/security/nss/lib/ssl/config.mk +++ b/security/nss/lib/ssl/config.mk @@ -65,9 +65,7 @@ else EXTRA_SHARED_LIBS += \ -L$(DIST)/lib/ \ -lnss3 \ - -lplc4 \ - -lplds4 \ - -lnspr4 \ + $(NSPR_LIBS) \ $(NULL) endif |