diff options
| author | Joachim Lingner <jl@openoffice.org> | 2009-11-30 13:50:49 +0100 |
|---|---|---|
| committer | Joachim Lingner <jl@openoffice.org> | 2009-11-30 13:50:49 +0100 |
| commit | 09bc28fb7b998f56b481fb07eb576f00ce72c26f (patch) | |
| tree | b1660d06edd52fa4901a63feae30cc93d4cbee51 /moz | |
| parent | a297f034210313dbf8ba6e47c94e795cac9c1481 (diff) | |
jl144: #i106132# nss does not build on MacOS 10.6 because of libsqlite3
Diffstat (limited to 'moz')
| -rw-r--r-- | moz/zipped/makefile.mk | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/moz/zipped/makefile.mk b/moz/zipped/makefile.mk index a7b3ea846e9b..78d867bd23f1 100644 --- a/moz/zipped/makefile.mk +++ b/moz/zipped/makefile.mk @@ -175,6 +175,8 @@ FREEBL=freebl3 .ENDIF # "$(OS)" == "SOLARIS" +#On Linux/Unix sqlite is delivered to $(SOLARLIBDIR)/sqlite/libsqlite3.so +#See readme.txt in module nss NSS_MODULE_RUNTIME_LIST:= \ $(FREEBL) \ nspr4 \ @@ -186,7 +188,7 @@ NSS_MODULE_RUNTIME_LIST:= \ plds4 \ smime3 \ softokn3 \ - sqlite3 \ + sqlite/sqlite3 \ ssl3 @@ -200,13 +202,13 @@ $(MISC)$/unpacked_$(TARGET)_inc $(BIN)$/mozruntime.zip echo >& $(NULLDEV) $(foreach,lib,$(LIBLIST) rm -f $(LB)$/$(lib) &&) \ echo >& $(NULLDEV) - $(foreach,lib,$(BIN_RUNTIMELIST) zip -d $(BIN)$/mozruntime.zip $(DLLPRE)$(lib)$(DLLPOST) &&) \ + $(foreach,lib,$(BIN_RUNTIMELIST) zip -d $(BIN)$/mozruntime.zip $(DLLPRE)$(lib:f)$(DLLPOST) &&) \ echo >& $(NULLDEV) .IF "$(GUI)"=="WNT" - $(foreach,lib,$(NSS_MODULE_RUNTIME_LIST) zip -g -j $(BIN)$/mozruntime.zip $(SOLARBINDIR)$/$(DLLPRE)$(lib)$(DLLPOST) &&) \ + +$(foreach,lib,$(NSS_MODULE_RUNTIME_LIST) zip -g -j $(BIN)$/mozruntime.zip $(SOLARBINDIR)$/$(DLLPRE)$(lib:f)$(DLLPOST) &&) \ echo >& $(NULLDEV) .ELSE - $(foreach,lib,$(NSS_MODULE_RUNTIME_LIST) zip -g -j $(BIN)$/mozruntime.zip $(SOLARLIBDIR)$/$(DLLPRE)$(lib)$(DLLPOST) &&) \ + +$(foreach,lib,$(NSS_MODULE_RUNTIME_LIST) zip -g -j $(BIN)$/mozruntime.zip $(SOLARLIBDIR)$/$(lib:d)$(DLLPRE)$(lib:f)$(DLLPOST) &&) \ echo >& $(NULLDEV) .ENDIF $(TOUCH) $@ |