diff options
| author | Tor Lillqvist <tml@collabora.com> | 2014-08-11 11:42:33 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2014-08-11 12:24:01 +0300 |
| commit | a59e2d4f05679142f10950c15a78b952ef0aac9e (patch) | |
| tree | c638711c9c193c0168039f730da594729fb31fd2 | |
| parent | 8c9f48cdd0fef6ae09e5654709924fd3f0a62f27 (diff) | |
fdo#82038: Make sending email from LO work again on OS X
Do build the cmdmail library, the uri-encode executable and do install
the senddoc script for OS X, too.
Note that in order for it to work, one needs to set the "E-mail
program" in Preferences:Internet:E-mail to /Applications/Mail.app. (Or
possibly some other application and/or executable.)
Change-Id: I5764c9891865983d46081edc854e321643c296cc
| -rw-r--r-- | Repository.mk | 2 | ||||
| -rw-r--r-- | postprocess/Rdb_services.mk | 2 | ||||
| -rw-r--r-- | shell/Module_shell.mk | 11 |
3 files changed, 11 insertions, 4 deletions
diff --git a/Repository.mk b/Repository.mk index 7d2cac52f409..e0438608cf37 100644 --- a/Repository.mk +++ b/Repository.mk @@ -262,7 +262,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \ chartcore \ chartcontroller \ chartopengl \ - $(if $(filter $(OS),MACOSX WNT),,cmdmail) \ + $(if $(filter $(OS),WNT),,cmdmail) \ cppcanvas \ configmgr \ ctl \ diff --git a/postprocess/Rdb_services.mk b/postprocess/Rdb_services.mk index 98667ad8eb11..4fab2adec205 100644 --- a/postprocess/Rdb_services.mk +++ b/postprocess/Rdb_services.mk @@ -331,7 +331,7 @@ $(eval $(call gb_Rdb_add_components,services,\ extensions/source/update/feed/updatefeed \ xmlhelp/util/ucpchelp1 \ xmlsecurity/util/xsec_xmlsec$(if $(filter WNT,$(OS)),.windows) \ - $(if $(filter-out MACOSX WNT,$(OS)),\ + $(if $(filter-out WNT,$(OS)),\ shell/source/cmdmail/cmdmail \ ) \ $(if $(filter-out WNT,$(OS)),\ diff --git a/shell/Module_shell.mk b/shell/Module_shell.mk index 2cbf29419d73..98f6c87690a7 100644 --- a/shell/Module_shell.mk +++ b/shell/Module_shell.mk @@ -115,12 +115,19 @@ ifneq ($(filter-out MACOSX WNT,$(OS)),) $(eval $(call gb_Module_add_targets,shell,\ Executable_gnome_open_url \ - Executable_uri_encode \ - Library_cmdmail \ Library_recentfile \ Package_scripts \ Package_scripts_gnome \ Package_scripts_kde \ +)) + +endif + +ifneq ($(OS),WNT) + +$(eval $(call gb_Module_add_targets,shell,\ + Executable_uri_encode \ + Library_cmdmail \ Package_senddoc \ )) |