From ea1ca253d3b24fd64cf6678785e4170f42ee06f9 Mon Sep 17 00:00:00 2001
From: Andras Timar <andras.timar@collabora.com>
Date: Fri, 15 May 2015 17:05:17 +0200
Subject: shell script in Contents/MacOS is not accepted

(cherry picked from commit c5d91c02192f4272ad2a200beffa059a7dc7a146)

Conflicts:
	scp2/source/ooo/file_ooo.scp

Change-Id: Ib047b763bfeff9dbf43db8fc11e6fd7f1fa179f8
---
 scp2/source/ooo/file_ooo.scp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'scp2/source')

diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index ce009ddd99ac..4f6a1eece4a1 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -59,7 +59,7 @@ End
 
 #endif
 
-#if defined UNX
+#if defined UNX && ! defined ENABLE_MACOSX_SANDBOX
 File gid_File_Bin_Senddoc
     BIN_FILE_BODY;
     Dir = FILELIST_DIR;
-- 
cgit