From b7a81e33bc960409dd1ca7ce8b02650bccabaf1d Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Mon, 24 Nov 2014 15:43:45 +0100
Subject: uno is the only remaining user of startup.sh

Change-Id: I0aa2f7384462777fc893aa282aea00aebd8dc664
---
 ure/Package_install.mk |  3 +--
 ure/source/startup.sh  | 47 -----------------------------------------------
 ure/source/uno         | 47 +++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 48 insertions(+), 49 deletions(-)
 delete mode 100755 ure/source/startup.sh
 create mode 100755 ure/source/uno

(limited to 'ure')

diff --git a/ure/Package_install.mk b/ure/Package_install.mk
index 13106f1cfcca..725077766304 100644
--- a/ure/Package_install.mk
+++ b/ure/Package_install.mk
@@ -10,8 +10,7 @@
 $(eval $(call gb_Package_Package,ure_install,$(SRCDIR)/ure/source))
 
 ifneq (,$(filter-out MACOSX WNT,$(OS)))
-$(eval $(call gb_Package_add_file,ure_install,$(LIBO_URE_BIN_FOLDER)/startup.sh,startup.sh))
-$(eval $(call gb_Package_add_symbolic_link,ure_install,$(LIBO_URE_BIN_FOLDER)/uno,startup.sh))
+$(eval $(call gb_Package_add_file,ure_install,$(LIBO_URE_BIN_FOLDER)/uno,uno))
 endif
 
 ifeq (MACOSX,$(OS))
diff --git a/ure/source/startup.sh b/ure/source/startup.sh
deleted file mode 100755
index eae7173acf7e..000000000000
--- a/ure/source/startup.sh
+++ /dev/null
@@ -1,47 +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 .
-#
-
-# Pass -env arguments on to javaldx; needs to be fixed:
-my_envargs=
-for my_arg in "$@" ; do
-  case ${my_arg} in
-    -env:*) my_envargs="${my_envargs} ${my_arg}" ;;
-  esac
-done
-
-# Extend the LD_LIBRARY_PATH for Java:
-epath=`dirname "$0"`
-if [ -x "${epath}/javaldx" ] ; then
-    jpath=`"${epath}/javaldx" $my_envargs`
-    if [ -n "${jpath}" ]; then
-        sd_platform=`uname -s`
-        case $sd_platform in
-          AIX)
-            LIBPATH=${jpath}${LIBPATH:+:${LIBPATH}}
-            export LIBPATH
-            ;;
-          *)
-            LD_LIBRARY_PATH=${jpath}${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}
-            export LD_LIBRARY_PATH
-            ;;
-        esac
-    fi
-fi
-
-exec "$0.bin" "$@"
diff --git a/ure/source/uno b/ure/source/uno
new file mode 100755
index 000000000000..eae7173acf7e
--- /dev/null
+++ b/ure/source/uno
@@ -0,0 +1,47 @@
+#!/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 .
+#
+
+# Pass -env arguments on to javaldx; needs to be fixed:
+my_envargs=
+for my_arg in "$@" ; do
+  case ${my_arg} in
+    -env:*) my_envargs="${my_envargs} ${my_arg}" ;;
+  esac
+done
+
+# Extend the LD_LIBRARY_PATH for Java:
+epath=`dirname "$0"`
+if [ -x "${epath}/javaldx" ] ; then
+    jpath=`"${epath}/javaldx" $my_envargs`
+    if [ -n "${jpath}" ]; then
+        sd_platform=`uname -s`
+        case $sd_platform in
+          AIX)
+            LIBPATH=${jpath}${LIBPATH:+:${LIBPATH}}
+            export LIBPATH
+            ;;
+          *)
+            LD_LIBRARY_PATH=${jpath}${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}
+            export LD_LIBRARY_PATH
+            ;;
+        esac
+    fi
+fi
+
+exec "$0.bin" "$@"
-- 
cgit