summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2012-11-07 13:37:57 +0100
committerStephan Bergmann <sbergman@redhat.com>2012-11-07 13:37:57 +0100
commit2ece91f79be01c1540328111ede717492222388b (patch)
tree155fc58b2efc25a7d163a8dbf68633e688c3c5be
parent949e06a801aa8b3939d621a450bf2b62c97fca16 (diff)
Always package at least mozbootstrap
...if not even mozab. Otherwise, there is no implementation of com.sun.star.mozilla.MozillaBootstrap and "File - Digital Signatures... - Sign Document..." cannot show any certificates from Mozilla profiles. Change-Id: Ie9b73fad798b2c2a3b52ba374ea967401694f685
-rw-r--r--connectivity/Module_connectivity.mk1
-rw-r--r--postprocess/packcomponents/makefile.mk4
-rw-r--r--scp2/source/ooo/file_library_ooo.scp1
3 files changed, 5 insertions, 1 deletions
diff --git a/connectivity/Module_connectivity.mk b/connectivity/Module_connectivity.mk
index fcf9c13e1796..c01f007bb3df 100644
--- a/connectivity/Module_connectivity.mk
+++ b/connectivity/Module_connectivity.mk
@@ -136,6 +136,7 @@ $(eval $(call gb_Module_add_targets,connectivity,\
Configuration_mork \
Executable_mork_helper \
Library_mork \
+ Library_mozbootstrap \
))
$(eval $(call gb_Module_add_check_targets,connectivity,\
diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk
index a6f386aa3841..d8e43bf271a6 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -389,7 +389,9 @@ my_components += component/connectivity/source/drivers/mozab/mozab
my_components += component/connectivity/source/drivers/mozab/bootstrap/mozbootstrap
.END
.ELIF "$(OS)" != "ANDROID" && "$(OS)" != "IOS"
-my_components += component/connectivity/source/drivers/mork/mork
+my_components += \
+ component/connectivity/source/drivers/mork/mork \
+ component/connectivity/source/drivers/mozab/bootstrap/mozbootstrap
.END
.IF "$(OS)" != "WNT" && "$(OS)" != "ANDROID" && "$(OS)" != "IOS" && "$(OS)" != "headless"
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index ff1d50915437..d3c08f3dc921 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -905,6 +905,7 @@ End
#else
STD_LIB_FILE(gid_File_Lib_Mork,mork)
+SPECIAL_LIB_FILE(gid_File_Lib_Mozbootstrap,mozbootstrap)
#endif