diff options
| author | sb <sb@openoffice.org> | 2009-11-13 14:45:27 +0100 |
|---|---|---|
| committer | sb <sb@openoffice.org> | 2009-11-13 14:45:27 +0100 |
| commit | 661efe7a78a3c741dde3204481b707d353609b55 (patch) | |
| tree | 8828ba07cfde8eee1090f98b7a62d71f92b8e7e0 /desktop/scripts | |
| parent | 8de0cce3e09f0b2fc7b5c46b10fa1acd9d9446b5 (diff) | |
sb116: #i106891# evaluate conditional expression in soffice script at build time (based on a patch by mmeeks)
Diffstat (limited to 'desktop/scripts')
| -rw-r--r-- | desktop/scripts/makefile.mk | 11 | ||||
| -rw-r--r-- | desktop/scripts/soffice.sh | 7 |
2 files changed, 13 insertions, 5 deletions
diff --git a/desktop/scripts/makefile.mk b/desktop/scripts/makefile.mk index 52750ca0b44f..001ead351928 100644 --- a/desktop/scripts/makefile.mk +++ b/desktop/scripts/makefile.mk @@ -54,7 +54,18 @@ UNIXTEXT= \ $(MISC)$/unopkg.sh .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 .INCLUDE : target.mk diff --git a/desktop/scripts/soffice.sh b/desktop/scripts/soffice.sh index 7aaa95bd3ffe..0690e9647f35 100644 --- a/desktop/scripts/soffice.sh +++ b/desktop/scripts/soffice.sh @@ -43,11 +43,8 @@ export SAL_ENABLE_FILE_LOCKING # working on your system. # SAL_NOOPENGL=true; export SAL_NOOPENGL -# the following test is needed on Linux PPC with IBM j2sdk142 -if [ "`uname -s`" = "Linux" -a "`uname -m`" = "ppc" ] ; then - JITC_PROCESSOR_TYPE=6 - export JITC_PROCESSOR_TYPE -fi +# The following is needed on Linux PPC with IBM j2sdk142: +#@# export JITC_PROCESSOR_TYPE=6 # resolve installation directory sd_cwd="`pwd`" |