make the needed change to soffice.sh at configure time

.gitignore

@@ -50,6 +50,7 @@
 /config.parms
 /config.status
 /configure
+/desktop/scripts/soffice.sh
 /Makefile
 /makefile.mk
 /set_soenv

configure.in

@@ -3681,6 +3681,7 @@ if test "$_os" = "Linux" && test "$host_cpu" = "powerpc"; then
     JITC_PROCESSOR_TYPE=6
     export JITC_PROCESSOR_TYPE
 fi
+AC_SUBST([JITC_PROCESSOR_TYPE])
 
 if test $_os = "WINNT"; then
     WITH_VC_REDIST="TRUE"
@@ -9353,7 +9354,10 @@ else
     echo > set_soenv.last
 fi
 
-AC_OUTPUT([set_soenv Makefile bin/repo-list])
+AC_OUTPUT([set_soenv Makefile bin/repo-list desktop/scripts/soffice.sh])
+
+# make sure this is executable
+chmod +x desktop/scripts/soffice.sh
 
 # touch the config timestamp file set_soenv.stamp
 if test ! -f set_soenv.stamp; then

desktop/prj/d.lst

@@ -94,7 +94,7 @@ mkdir: %_DEST%\bin\odf4ms
 
 ..\%__SRC%\bin\*.res %_DEST%\bin\*.res
 
-..\%__SRC%\misc\soffice.sh-expanded %_DEST%\bin\soffice
+..\%__SRC%\misc\soffice.sh %_DEST%\bin\soffice
 ..\%__SRC%\misc\sbase.sh %_DEST%\bin\sbase
 ..\%__SRC%\misc\scalc.sh %_DEST%\bin\scalc
 ..\%__SRC%\misc\sdraw.sh %_DEST%\bin\sdraw

desktop/scripts/makefile.mk

@@ -52,15 +52,6 @@ UNIXTEXT= \
 
 .IF "$(OS)" != "MACOSX"
 
-ALLTAR: $(MISC)$/soffice.sh-expanded
-
-$(MISC)/soffice.sh-expanded: $(MISC)/soffice.sh
-.IF "$(OS)" == "LINUX" && "$(CPUNAME)" == "POWERPC"
-    $(SED) 's/^#@# //' $< > $@
-.ELSE
-    $(COPY) $< $@
-.ENDIF
-
 UNIXTEXT+= $(MISC)$/soffice.sh
 
 .ENDIF

desktop/scripts/soffice.sh.in

@@ -45,8 +45,7 @@ export SAL_ENABLE_FILE_LOCKING
 # uncomment line below if you encounter problems starting soffice on your system
 # SAL_NO_XINITTHREADS=true; export SAL_NO_XINITTHREADS
 
-# The following is needed on Linux PPC with IBM j2sdk142:
+@JITC_PROCESSOR_TYPE@
-#@# export JITC_PROCESSOR_TYPE=6
 
 # resolve installation directory
 sd_cwd=`pwd`