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 /desktop/scripts | |
| parent | 272912b12fac68a9efe8aae0b76e63859b6e977b (diff) | |
make the needed change to soffice.sh at configure time
Diffstat (limited to 'desktop/scripts')
| -rwxr-xr-x | desktop/scripts/makefile.mk | 9 | ||||
| -rwxr-xr-x | desktop/scripts/soffice.sh.in (renamed from desktop/scripts/soffice.sh) | 3 |
2 files changed, 1 insertions, 11 deletions
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` |