diff options
| -rw-r--r-- | desktop/CustomTarget_soffice.mk | 6 | ||||
| -rw-r--r-- | desktop/Module_desktop.mk | 5 | ||||
| -rwxr-xr-x | desktop/scripts/soffice.sh | 2 | ||||
| -rw-r--r-- | scp2/source/ooo/common_brand.scp | 2 |
4 files changed, 7 insertions, 8 deletions
diff --git a/desktop/CustomTarget_soffice.mk b/desktop/CustomTarget_soffice.mk index 83b84ab49e2f..74eb6c9d6e3c 100644 --- a/desktop/CustomTarget_soffice.mk +++ b/desktop/CustomTarget_soffice.mk @@ -40,10 +40,4 @@ 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/Module_desktop.mk b/desktop/Module_desktop.mk index f043a6133148..cb067b3205c6 100644 --- a/desktop/Module_desktop.mk +++ b/desktop/Module_desktop.mk @@ -116,6 +116,11 @@ else ifeq ($(OS),IOS) else ifeq ($(GUIBASE),headless) +$(eval $(call gb_Module_add_targets,desktop,\ + Executable_oosplash \ + Library_spl_unx \ +)) + else $(eval $(call gb_Module_add_targets,desktop,\ diff --git a/desktop/scripts/soffice.sh b/desktop/scripts/soffice.sh index b0ba98d02b3b..a259bf69c854 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/@SOFFICEBIN@" "$@" +exec $VALGRINDCHECK $STRACECHECK "$sd_prog/oosplash" "$@" diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp index 5d89ae8626f3..968a5508688f 100644 --- a/scp2/source/ooo/common_brand.scp +++ b/scp2/source/ooo/common_brand.scp @@ -525,7 +525,7 @@ File gid_Brand_File_Bin_Soffice_Bin Name = "soffice.bin"; End -#if defined UNX && ! defined MACOSX && ! defined LIBO_HEADLESS +#if defined UNX && ! defined MACOSX File gid_File_Bin_QStart_Bin BIN_FILE_BODY; |