diff options
| author | Pader Rezso <rezso@rezso.net> | 2013-07-01 15:38:36 +0100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@suse.com> | 2013-07-01 15:39:24 +0100 |
| commit | cea7cca5c8db3f273ed2c14efde45ff0e73dee7a (patch) | |
| tree | d770e4f2d0ffd33421b91a298d520ece914ebc1c /shell | |
| parent | bd4c6a7d7521abb0e36ebfba6e14685a1e195be8 (diff) | |
remove obsolete CDE integration, and make TDE launcher conditional.
Change-Id: I5e830cd3f44627d789d789748e1b0f0ff5590d91
Diffstat (limited to 'shell')
| -rw-r--r-- | shell/Package_scripts.mk | 4 | ||||
| -rw-r--r-- | shell/source/unix/misc/cde-open-url.sh | 30 |
2 files changed, 3 insertions, 31 deletions
diff --git a/shell/Package_scripts.mk b/shell/Package_scripts.mk index 3bccf286bb2f..d300337166bf 100644 --- a/shell/Package_scripts.mk +++ b/shell/Package_scripts.mk @@ -11,8 +11,10 @@ $(eval $(call gb_Package_Package,shell_scripts,$(SRCDIR)/shell/source/unix/misc) $(eval $(call gb_Package_set_outdir,shell_scripts,$(INSTDIR))) -$(eval $(call gb_Package_add_file,shell_scripts,$(gb_PROGRAMDIRNAME)/cde-open-url,cde-open-url.sh)) $(eval $(call gb_Package_add_file,shell_scripts,$(gb_PROGRAMDIRNAME)/open-url,open-url.sh)) + +ifeq ($(ENABLE_TDE),TRUE) $(eval $(call gb_Package_add_file,shell_scripts,$(gb_PROGRAMDIRNAME)/tde-open-url,tde-open-url.sh)) +endif # vim: set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/shell/source/unix/misc/cde-open-url.sh b/shell/source/unix/misc/cde-open-url.sh deleted file mode 100644 index baa74dfa0821..000000000000 --- a/shell/source/unix/misc/cde-open-url.sh +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/sh -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# -# This file incorporates work covered by the following license notice: -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed -# with this work for additional information regarding copyright -# ownership. The ASF licenses this file to you under the Apache -# License, Version 2.0 (the "License"); you may not use this file -# except in compliance with the License. You may obtain a copy of -# the License at http://www.apache.org/licenses/LICENSE-2.0 . -# - -if [ -x /usr/bin/mktemp ] -then - TMPFILE=`mktemp -t open-url.XXXXXX` -else - DTTMPDIR=`xrdb -query | grep DtTmpDir` - TMPFILE=${DTTMPDIR:-$HOME/.dt/tmp}/open-url.$$ -fi - -if [ -z "$TMPFILE" ]; then exit 1; fi -( echo "$1" > "$TMPFILE"; dtaction Open "$TMPFILE"; rm -f "$TMPFILE" ) & -exit 0 |