From dae66b7b1df89d824017c7afb52f66ebfd2b8fe2 Mon Sep 17 00:00:00 2001
From: Riccardo Magliocchetti <riccardo.magliocchetti@gmail.com>
Date: Fri, 7 Sep 2012 20:11:41 +0200
Subject: desktop: use soffice.bin instead of oosplash if build with
 --enable-headless

Change-Id: I2e4742a6893267ea8d4ec2048dd0686fd309a7db
---
 desktop/CustomTarget_soffice.mk | 6 ++++++
 desktop/scripts/soffice.sh      | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/desktop/CustomTarget_soffice.mk b/desktop/CustomTarget_soffice.mk
index 74eb6c9d6e3c..83b84ab49e2f 100644
--- a/desktop/CustomTarget_soffice.mk
+++ b/desktop/CustomTarget_soffice.mk
@@ -40,4 +40,10 @@ else
 	cp $< $@
 endif
 
+ifeq ($(strip $(ENABLE_HEADLESS)),TRUE)
+	sed -i "s/@SOFFICEBIN@/soffice.bin/" $@
+else
+	sed -i "s/@SOFFICEBIN@/oosplash/" $@
+endif
+
 # vim:set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/desktop/scripts/soffice.sh b/desktop/scripts/soffice.sh
index a259bf69c854..b0ba98d02b3b 100755
--- a/desktop/scripts/soffice.sh
+++ b/desktop/scripts/soffice.sh
@@ -175,4 +175,4 @@ for arg in $@ ; do
 done
 
 # oosplash does the rest: forcing pages in, javaldx etc. are
-exec $VALGRINDCHECK $STRACECHECK "$sd_prog/oosplash" "$@"
+exec $VALGRINDCHECK $STRACECHECK "$sd_prog/@SOFFICEBIN@" "$@"
-- 
cgit