[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - postprocess/Rdb_services.mk Repository.mk shell/Module_shell.mk

[Tor Lillqvist]

 Repository.mk               |    2 +-
 postprocess/Rdb_services.mk |    2 +-
 shell/Module_shell.mk       |   11 +++++++++--
 3 files changed, 11 insertions(+), 4 deletions(-)

New commits:
commit 5496d431f991ce9e8e0dc953d2cb1d40db899ee0
Author: Tor Lillqvist <tml at collabora.com>
Date:   Mon Aug 11 11:42:33 2014 +0300

    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
    (cherry picked from commit a59e2d4f05679142f10950c15a78b952ef0aac9e)
    Reviewed-on: https://gerrit.libreoffice.org/11257
    Reviewed-by: Alexander Werner <bundeswerner at gmail.com>
    Tested-by: Alexander Werner <bundeswerner at gmail.com>

diff --git a/Repository.mk b/Repository.mk
index 9a56d6a..326c2f1 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -233,7 +233,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 a1fe9bc..06906d9 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 15ab847..3c51964 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 \
 ))