summaryrefslogtreecommitdiffstats
path: root/desktop/scripts
diff options
context:
space:
mode:
authorDavid Tardon <dtardon@redhat.com>2012-01-11 17:31:44 +0100
committerDavid Tardon <dtardon@redhat.com>2012-01-11 17:32:41 +0100
commit7ad72045d7c3a99dbb67f817ad570097de383c3f (patch)
treefb3f7effa41fe7daa4461cc56824081c43718646 /desktop/scripts
parentbah, i forgot *export* (diff)
downloadcore-7ad72045d7c3a99dbb67f817ad570097de383c3f.tar.gz
core-7ad72045d7c3a99dbb67f817ad570097de383c3f.zip
avoid generating a file in the source tree
Diffstat (limited to 'desktop/scripts')
-rw-r--r--desktop/scripts/Makefile35
-rwxr-xr-xdesktop/scripts/soffice.sh (renamed from desktop/scripts/soffice.sh.in)2
2 files changed, 36 insertions, 1 deletions
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`