diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2010-01-05 15:21:29 +0100 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2010-01-05 15:21:29 +0100 |
| commit | 9f9fb62569c97ec7a49c8c2b582267b309651ac9 (patch) | |
| tree | dfd388aaf21e19b2d6f62056e42e7fdeb62e22c4 /moz | |
| parent | c563075efe2697200dec63103e7eeb7184386f37 (diff) | |
| parent | 56cb5496a8a8a64ab4a6a6d8d820d9dc3bded3c9 (diff) | |
CWS-TOOLING: integrate CWS jl144
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 b4f85f93e748..c8497d36acf9 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) $@ |