7 files changed, 83 insertions, 5 deletions
diff --git a/config_host.mk.in b/config_host.mk.in
index 236a58c1f304..57125bd0fcde 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -167,6 +167,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 JFREEREPORT_JAR="@JFREEREPORT_JAR@"
 export KDE4_CFLAGS="@KDE4_CFLAGS@"
 export KDE4_LIBS="@KDE4_LIBS@"
diff --git a/configure.in b/configure.in
index e44bf75df40c..d3b3a7e1448f 100644
--- a/configure.in
+++ b/configure.in
@@ -10422,12 +10422,9 @@ else
     echo > set_soenv.last
 fi
 
-AC_CONFIG_FILES([config_host.mk ooo.lst set_soenv bin/repo-list desktop/scripts/soffice.sh build_env])
+AC_CONFIG_FILES([config_host.mk ooo.lst set_soenv bin/repo-list build_env])
 AC_OUTPUT
 
-# 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
     echo > set_soenv.stamp
diff --git a/desktop/Module_desktop.mk b/desktop/Module_desktop.mk
index c14600fe20b6..267cc2c57fbd 100644
--- a/desktop/Module_desktop.mk
+++ b/desktop/Module_desktop.mk
@@ -68,6 +68,11 @@ $(eval $(call gb_Module_add_targets,desktop,\
     Pagein_impress \
     Pagein_writer \
 ))
+ifneq ($(JITC_PROCESSOR_TYPE_EXPORT),)
+$(eval $(call gb_Module_add_targets,desktop,\
+    Package_soffice_sh \
+))
+endif
 endif
 
 ifeq ($(OS),WNT)
diff --git a/desktop/Package_scripts.mk b/desktop/Package_scripts.mk
index d2afeda78959..76117652a0c2 100644
--- a/desktop/Package_scripts.mk
+++ b/desktop/Package_scripts.mk
@@ -47,10 +47,12 @@ $(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
 
diff --git a/desktop/Package_soffice_sh.mk b/desktop/Package_soffice_sh.mk
new file mode 100644
index 000000000000..5cf1df356a58
--- /dev/null
+++ b/desktop/Package_soffice_sh.mk
@@ -0,0 +1,38 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2010 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+#  (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Package_Package,desktop_soffice_sh,$(WORKDIR)/CustomTarget/desktop/scripts))
+
+$(eval $(call gb_Package_add_file,desktop_soffice_sh,bin/soffice,soffice.sh))
+
+$(eval $(call gb_Package_add_customtarget,desktop_soffice_sh,desktop/scripts))
+
+$(eval $(call gb_CustomTarget_add_dependencies,desktop/scripts,\
+    desktop/scripts/soffice.sh \
+))
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/desktop/scripts/Makefile b/desktop/scripts/Makefile
new file mode 100644
index 000000000000..349c5dd1c155
--- /dev/null
+++ b/desktop/scripts/Makefile
@@ -0,0 +1,35 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2010 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+#  (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+soffice.sh : $(SRCDIR)/desktop/scripts/soffice.sh
+	sed -e "s/^#@JITC_PROCESSOR_TYPE_EXPORT@/$(JITC_PROCESSOR_TYPE_EXPORT)/" $< > $@
+
+.DEFAULT_GOAL := all
+.PHONY : all
+all : soffice.sh
+
+# vim:set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/desktop/scripts/soffice.sh.in b/desktop/scripts/soffice.sh
index 2014ab932d58..130f04742700 100755
--- a/desktop/scripts/soffice.sh.in
+++ b/desktop/scripts/soffice.sh
@@ -45,7 +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
 
-@JITC_PROCESSOR_TYPE_EXPORT@
+#@JITC_PROCESSOR_TYPE_EXPORT@
 
 # resolve installation directory
 sd_cwd=`pwd`