Skip to content

C
core
Kaydet (Commit) dae66b7b authored tarafından Riccardo Magliocchetti's avatar Riccardo Magliocchetti
Dosyalara gözat
Seçenekler

desktop: use soffice.bin instead of oosplash if build with --enable-headless 

Change-Id: I2e4742a6893267ea8d4ec2048dd0686fd309a7db
üst 4d408cc2
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 1 deletion
desktop/CustomTarget_soffice.mk
Dosyayı görüntüle @ dae66b7b
...@@ -40,4 +40,10 @@ else ...@@ -40,4 +40,10 @@ else
cp $< $@ cp $< $@
endif 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: # vim:set shiftwidth=4 tabstop=4 noexpandtab:
desktop/scripts/soffice.sh
Dosyayı görüntüle @ dae66b7b
...@@ -175,4 +175,4 @@ for arg in $@ ; do ...@@ -175,4 +175,4 @@ for arg in $@ ; do
done done
# oosplash does the rest: forcing pages in, javaldx etc. are # oosplash does the rest: forcing pages in, javaldx etc. are
exec $VALGRINDCHECK $STRACECHECK "$sd_prog/oosplash" "$@" exec $VALGRINDCHECK $STRACECHECK "$sd_prog/@SOFFICEBIN@" "$@"
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment