simplify handling of JITC_PROCESSOR_TYPE

config_host.mk.in

@@ -173,7 +173,7 @@ export INSTALLDIR="@INSTALLDIR@"
 export INSTALLDIRNAME="@INSTALLDIRNAME@"
 export INTRO_BIPMAP="@INTRO_BITMAP@"
 @x_JAVALIB@ export JAVALIB="@JAVALIB@"
-export JITC_PROCESSOR_TYPE_EXPORT="@JITC_PROCESSOR_TYPE_EXPORT@"
+export JITC_PROCESSOR_TYPE="@JITC_PROCESSOR_TYPE@"
 export JFREEREPORT_JAR="@JFREEREPORT_JAR@"
 export KDE4_CFLAGS="@KDE4_CFLAGS@"
 export KDE4_LIBS="@KDE4_LIBS@"

configure.in

@@ -4309,13 +4309,13 @@ dnl empty or non-empty.
 
 dnl SOLAR_JAVA="" indicate no java support at all
 
+JITC_PROCESSOR_TYPE=""
 if test "$_os" = "Linux" && test "$host_cpu" = "powerpc"; then
     # IBMs JDK needs this...
     JITC_PROCESSOR_TYPE=6
     export JITC_PROCESSOR_TYPE
-    JITC_PROCESSOR_TYPE_EXPORT="export JITC_PROCESSOR_TYPE=$JITC_PROCESSOR_TYPE"
 fi
-AC_SUBST([JITC_PROCESSOR_TYPE_EXPORT])
+AC_SUBST([JITC_PROCESSOR_TYPE])
 
 if test $_os = "WINNT"; then
     WITH_VC_REDIST="TRUE"

desktop/Module_desktop.mk

@@ -71,14 +71,12 @@ $(eval $(call gb_Module_add_targets,desktop,\
 
 ifneq ($(OS),MACOSX)
 ifneq ($(OS),WNT)
-ifneq ($(JITC_PROCESSOR_TYPE_EXPORT),)
 $(eval $(call gb_Module_add_targets,desktop,\
     Package_soffice_sh \
 ))
 endif
 endif
 endif
-endif
 
 ifeq ($(OS),WNT)
 

desktop/Package_scripts.mk

@@ -46,14 +46,6 @@ $(eval $(call gb_Package_add_file,desktop_scripts,bin/swriter,swriter.sh))
 $(eval $(call gb_Package_add_file,desktop_scripts,bin/unoinfo,unoinfo.sh))
 $(eval $(call gb_Package_add_file,desktop_scripts,bin/unopkg,unopkg.sh))
 
-ifneq ($(OS),MACOSX)
-ifeq ($(JITC_PROCESSOR_TYPE_EXPORT),)
-
-$(eval $(call gb_Package_add_file,desktop_scripts,bin/soffice,soffice.sh))
-
-endif
-endif
-
 endif
 
 # vim: set ts=4 sw=4 et:

desktop/scripts/Makefile

@@ -26,7 +26,11 @@
 # instead of those above.
 
 soffice.sh : $(SRCDIR)/desktop/scripts/soffice.sh
-	sed -e "s/^#@JITC_PROCESSOR_TYPE_EXPORT@/$(JITC_PROCESSOR_TYPE_EXPORT)/" $< > $@
+ifneq ($(JITC_PROCESSOR_TYPE),)
+	sed -e "s/^#@JITC_PROCESSOR_TYPE_EXPORT@/export JITC_PROCESSOR_TYPE=$(JITC_PROCESSOR_TYPE)/" $< > $@
+else
+	cp $< $@
+endif
 
 .DEFAULT_GOAL := all
 .PHONY : all

set_soenv.in

@@ -888,9 +888,6 @@ if ("@ENABLE_WERROR@" eq "FALSE") {
 ToFile( "EXTERNAL_WARNINGS_NOT_ERRORS", "TRUE",  "e" );
 }
 ToFile( "PROEXT",            $PROEXT,            "e" );
-if ($platform =~ m/linux/ && $platform =~ m/powerpc/) {
-ToFile( "JITC_PROCESSOR_TYPE","6",                 "e" );
-}
 ToFile( "nodep",             "@nodep@",          "e" );
 ToFile( "TARFILE_LOCATION",  $TARFILE_LOCATION,  "e" );