diff --git a/config_host.mk.in b/config_host.mk.in index 6d4e5036c70a..15b1c2b74e9a 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -147,7 +147,7 @@ export DPKG=@DPKG@ export EBOOK_CFLAGS=$(gb_SPACE)@EBOOK_CFLAGS@ export EBOOK_LIBS=$(gb_SPACE)@EBOOK_LIBS@ export EMSDK_FILE_PACKAGER=@EMSDK_FILE_PACKAGER@ -export EMSCRIPTEN_EXTRA_SOFFICE_POST_JS=@EMSCRIPTEN_EXTRA_SOFFICE_POST_JS@ +export EMSCRIPTEN_EXTRA_SOFFICE_PRE_JS=@EMSCRIPTEN_EXTRA_SOFFICE_PRE_JS@ export ENABLE_ANDROID_LOK=@ENABLE_ANDROID_LOK@ export ENABLE_ANDROID_EDITING=@ENABLE_ANDROID_EDITING@ export ENABLE_AVAHI=@ENABLE_AVAHI@ diff --git a/configure.ac b/configure.ac index 1de3ce8e6b99..61f961f66370 100644 --- a/configure.ac +++ b/configure.ac @@ -1489,7 +1489,7 @@ if test "$_os" = "Emscripten"; then BUILD_TYPE="$BUILD_TYPE EMSCRIPTEN" fi AC_SUBST(EMSDK_FILE_PACKAGER) -AC_SUBST(EMSCRIPTEN_EXTRA_SOFFICE_POST_JS) +AC_SUBST(EMSCRIPTEN_EXTRA_SOFFICE_PRE_JS) ############################################################################### # Extensions switches --enable/--disable diff --git a/desktop/Executable_soffice_bin.mk b/desktop/Executable_soffice_bin.mk index be3b303190c2..f50cfb17633e 100644 --- a/desktop/Executable_soffice_bin.mk +++ b/desktop/Executable_soffice_bin.mk @@ -75,12 +75,12 @@ endif $(call gb_Executable_get_linktarget_target,soffice_bin): \ $(gb_CustomTarget_workdir)/static/unoembind/bindings_uno.js \ $(SRCDIR)/static/emscripten/uno.js \ - $(EMSCRIPTEN_EXTRA_SOFFICE_POST_JS) + $(EMSCRIPTEN_EXTRA_SOFFICE_PRE_JS) $(eval $(call gb_Executable_add_ldflags,soffice_bin, \ --post-js $(gb_CustomTarget_workdir)/static/unoembind/bindings_uno.js \ --post-js $(SRCDIR)/static/emscripten/uno.js \ - $(foreach i,$(EMSCRIPTEN_EXTRA_SOFFICE_POST_JS),--post-js $(i)) \ + $(foreach i,$(EMSCRIPTEN_EXTRA_SOFFICE_PRE_JS),--pre-js $(i)) \ )) ifeq ($(ENABLE_DBGUTIL)-$(gb_SUPPRESS_TESTS),TRUE-) diff --git a/static/README.wasm.md b/static/README.wasm.md index 48a109bd8469..8eb226f6e97e 100644 --- a/static/README.wasm.md +++ b/static/README.wasm.md @@ -264,7 +264,7 @@ put next to the `qt_soffice.html` that you serve to the browser (i.e., in Module.uno_scripts = ['./example.js']; ``` And rebuild LO configured with an additional -`EMSCRIPTEN_EXTRA_SOFFICE_POST_JS=/...path-to.../include.js`. +`EMSCRIPTEN_EXTRA_SOFFICE_PRE_JS=/...path-to.../include.js`. ## Tools for problem diagnosis