diff options
| author | David Tardon <dtardon@redhat.com> | 2011-09-15 12:49:33 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2011-09-15 14:48:05 +0200 |
| commit | ab5ce3f70a5635c3ca141b5c8928a104b522e1bb (patch) | |
| tree | 198a96bb9122a668edc299a2db72e5cd03a9a3fc | |
| parent | 272912b12fac68a9efe8aae0b76e63859b6e977b (diff) | |
make the needed change to soffice.sh at configure time
| -rw-r--r-- | .gitignore | 1 | ||||
| -rwxr-xr-x | configure.in | 6 | ||||
| -rw-r--r-- | desktop/prj/d.lst | 2 | ||||
| -rwxr-xr-x | desktop/scripts/makefile.mk | 9 | ||||
| -rwxr-xr-x | desktop/scripts/soffice.sh.in (renamed from desktop/scripts/soffice.sh) | 3 |
5 files changed, 8 insertions, 13 deletions
diff --git a/.gitignore b/.gitignore index 8afcf968d0f9..b7877e39011f 100644 --- a/.gitignore +++ b/.gitignore @@ -50,6 +50,7 @@ /config.parms /config.status /configure +/desktop/scripts/soffice.sh /Makefile /makefile.mk /set_soenv diff --git a/configure.in b/configure.in index 4d5ceedbfcf4..0560d607d17d 100755 --- a/configure.in +++ b/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 diff --git a/desktop/prj/d.lst b/desktop/prj/d.lst index 008ade9ff656..15ce1e885f79 100644 --- a/desktop/prj/d.lst +++ b/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 diff --git a/desktop/scripts/makefile.mk b/desktop/scripts/makefile.mk index ce0c9b8ed292..55354f9d325c 100755 --- a/desktop/scripts/makefile.mk +++ b/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 diff --git a/desktop/scripts/soffice.sh b/desktop/scripts/soffice.sh.in index 775f9741f059..727095d1b2c6 100755 --- a/desktop/scripts/soffice.sh +++ b/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: -#@# export JITC_PROCESSOR_TYPE=6 +@JITC_PROCESSOR_TYPE@ # resolve installation directory sd_cwd=`pwd` |