Repository.mk | 2 +-
scp2/source/ooo/file_ooo.scp | 2 +-
shell/Module_shell.mk | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit f3f63f555df87449b2d2a33718589b3afb3d9ddf
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Thu Nov 6 14:11:35 2014 +0100
fdo#82038: senddoc, uri-encode got lost on Mac
Change-Id: I2f104c64601b22ce3ef078295c7da3cb21a133f9
diff --git a/Repository.mk b/Repository.mk
index 970435f..0e7b9b9 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -144,7 +144,7 @@ $(eval $(call
gb_Helper_register_executables_for_install,OOO,ooo, \
gengal \
$(if $(filter
unx-TRUE,$(GUIBASE)-$(ENABLE_NPAPI_FROM_BROWSER)),pluginapp.bin) \
$(if $(filter unx-TRUE,$(GUIBASE)-$(ENABLE_TDE)),tdefilepicker) \
- $(if $(filter unx,$(GUIBASE)),uri-encode) \
+ $(if $(filter WNT,$(OS)),,uri-encode) \
ui-previewer \
$(if $(filter WNT,$(OS)), \
senddoc \
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index 86128d0..5f31ae4 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -158,7 +158,7 @@ End
#endif
-#if defined UNX && ! defined MACOSX
+#if defined UNX
File gid_File_Bin_Senddoc
BIN_FILE_BODY;
Dir = FILELIST_DIR;
diff --git a/shell/Module_shell.mk b/shell/Module_shell.mk
index 4a291de..98f6c87 100644
--- a/shell/Module_shell.mk
+++ b/shell/Module_shell.mk
@@ -115,7 +115,6 @@ ifneq ($(filter-out MACOSX WNT,$(OS)),)
$(eval $(call gb_Module_add_targets,shell,\
Executable_gnome_open_url \
- Executable_uri_encode \
Library_recentfile \
Package_scripts \
Package_scripts_gnome \
@@ -127,6 +126,7 @@ endif
ifneq ($(OS),WNT)
$(eval $(call gb_Module_add_targets,shell,\
+ Executable_uri_encode \
Library_cmdmail \
Package_senddoc \
))
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
