- cleanup (no system libs installed now)
[packages/firefox.git] / mozilla-firefox-nss.patch
CommitLineData
059ed714 1diff -ur firefox.orig/config/config.mk firefox/config/config.mk
2--- firefox.orig/config/config.mk 2004-06-05 02:26:13.000000000 +0200
3+++ firefox/config/config.mk 2004-06-16 09:42:32.000000000 +0200
690d8157
JB
4@@ -169,7 +169,7 @@
5
6 NSS_LIBS = \
7 $(LIBS_DIR) \
8- $(DIST)/lib/$(LIB_PREFIX)crmf.$(LIB_SUFFIX) \
9+ -lcrmf \
10 -lsmime3 \
11 -lssl3 \
12 -lnss3 \
13@@ -189,11 +189,6 @@
14 endif
15
16 NSS_DEP_LIBS = \
17- $(DIST)/lib/$(LIB_PREFIX)crmf.$(LIB_SUFFIX) \
18- $(DIST)/lib/$(DLL_PREFIX)smime3$(DLL_SUFFIX) \
19- $(DIST)/lib/$(DLL_PREFIX)ssl3$(DLL_SUFFIX) \
20- $(DIST)/lib/$(DLL_PREFIX)nss3$(DLL_SUFFIX) \
21- $(DIST)/lib/$(DLL_PREFIX)softokn3$(DLL_SUFFIX) \
22 $(NULL)
23
24 MOZ_UNICHARUTIL_LIBS = $(DIST)/lib/$(LIB_PREFIX)unicharutil_s.$(LIB_SUFFIX)
059ed714 25diff -ur firefox.orig/security/manager/Makefile.in firefox/security/manager/Makefile.in
26--- firefox.orig/security/manager/Makefile.in 2004-03-23 05:15:56.000000000 +0100
27+++ firefox/security/manager/Makefile.in 2004-06-16 09:48:35.000000000 +0200
28@@ -148,43 +148,6 @@
690d8157
JB
29 else
30 cd $(DIST)/lib; cp -f $(LIB_PREFIX)mozdbm_s.$(LIB_SUFFIX) $(LIB_PREFIX)dbm.$(LIB_SUFFIX); $(RANLIB) $(LIB_PREFIX)dbm.$(LIB_SUFFIX)
31 endif
32- $(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS)
059ed714 33-ifndef SKIP_CHK
690d8157
JB
34- $(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS)
35- $(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS)
059ed714 36-endif
690d8157
JB
37-ifndef DISABLE_DIST_GRE
38- $(INSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE) $(GRE_DIST)
059ed714 39-ifndef SKIP_CHK
690d8157 40- $(INSTALL) -m 644 $(DIST)/lib/$(SOFTOKEN3_CHK) $(GRE_DIST)
059ed714 41-endif
690d8157
JB
42- $(INSTALL) -m 755 $(DIST)/lib/$(SOFTOKEN3_LIB) $(GRE_DIST)
43- $(INSTALL) -m 755 $(DIST)/lib/$(NSS3_LIB) $(GRE_DIST)
44- $(INSTALL) -m 755 $(DIST)/lib/$(SSL3_LIB) $(GRE_DIST)
45- $(INSTALL) -m 755 $(DIST)/lib/$(SMIME3_LIB) $(GRE_DIST)
46-ifdef HAVE_FREEBL_MODULES
47- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_PURE32_CHK) $(GRE_DIST)
48- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_PURE32_MODULE) $(GRE_DIST)
49- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_HYBRID_CHK) $(GRE_DIST)
50- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_HYBRID_MODULE) $(GRE_DIST)
51-endif
52-endif
53-ifndef _SKIP_OLD_GRE_INSTALL
54- $(INSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE) $(DIST)/bin
059ed714 55-ifndef SKIP_CHK
690d8157 56- $(INSTALL) -m 644 $(DIST)/lib/$(SOFTOKEN3_CHK) $(DIST)/bin
059ed714 57-endif
690d8157
JB
58- $(INSTALL) -m 755 $(DIST)/lib/$(SOFTOKEN3_LIB) $(DIST)/bin
59- $(INSTALL) -m 755 $(DIST)/lib/$(NSS3_LIB) $(DIST)/bin
60- $(INSTALL) -m 755 $(DIST)/lib/$(SSL3_LIB) $(DIST)/bin
61- $(INSTALL) -m 755 $(DIST)/lib/$(SMIME3_LIB) $(DIST)/bin
62-ifdef HAVE_FREEBL_MODULES
63- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_PURE32_CHK) $(DIST)/bin
64- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_PURE32_MODULE) $(DIST)/bin
65- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_HYBRID_CHK) $(DIST)/bin
66- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_HYBRID_MODULE) $(DIST)/bin
67-endif
68-endif
69 $(MAKE) -C boot $@
70 $(MAKE) -C ssl $@
71 ifdef MOZ_XUL
059ed714 72diff -ur firefox.orig/security/manager/ssl/src/Makefile.in firefox/security/manager/ssl/src/Makefile.in
73--- firefox.orig/security/manager/ssl/src/Makefile.in 2004-01-07 14:36:51.000000000 +0100
74+++ firefox/security/manager/ssl/src/Makefile.in 2004-06-16 09:42:34.000000000 +0200
75@@ -116,7 +116,7 @@
690d8157
JB
76
77 # Use local includes because they are inserted before INCLUDES
78 # so that Mozilla's nss.h is used, not glibc's
79-LOCAL_INCLUDES += -I$(DIST)/public/nss \
80+LOCAL_INCLUDES += -I/usr/include/nss \
81 $(NULL)
82
83 EXTRA_DSO_LDOPTS += \
This page took 0.07833 seconds and 4 git commands to generate.