summaryrefslogtreecommitdiff
path: root/ure
diff options
context:
space:
mode:
Diffstat (limited to 'ure')
-rw-r--r--ure/Package_builddir_install.mk2
-rw-r--r--ure/Package_install.mk1
-rw-r--r--ure/source/uno.ini23
3 files changed, 2 insertions, 24 deletions
diff --git a/ure/Package_builddir_install.mk b/ure/Package_builddir_install.mk
index c109bd47a325..49defbc5404b 100644
--- a/ure/Package_builddir_install.mk
+++ b/ure/Package_builddir_install.mk
@@ -9,8 +9,10 @@
$(eval $(call gb_Package_Package,ure_builddir_install,$(BUILDDIR)/ure/source))
+ifneq ($(CROSS_COMPILING),)
$(eval $(call gb_Package_add_files,ure_builddir_install,$(LIBO_URE_ETC_FOLDER),\
$(if $(filter unorc,$(call gb_Helper_get_rcfile,uno)),$(call gb_Helper_get_rcfile,uno)) \
))
+endif
# vim:set noet sw=4 ts=4:
diff --git a/ure/Package_install.mk b/ure/Package_install.mk
index 9834c632d29d..16acfed9bbd6 100644
--- a/ure/Package_install.mk
+++ b/ure/Package_install.mk
@@ -24,7 +24,6 @@ endif
$(eval $(call gb_Package_add_files,ure_install,$(LIBO_URE_ETC_FOLDER),\
$(call gb_Helper_get_rcfile,jvmfwk3) \
- $(if $(filter unorc,$(call gb_Helper_get_rcfile,uno)),,$(call gb_Helper_get_rcfile,uno)) \
))
# vim:set noet sw=4 ts=4:
diff --git a/ure/source/uno.ini b/ure/source/uno.ini
deleted file mode 100644
index 6c04cae9a38c..000000000000
--- a/ure/source/uno.ini
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# 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 .
-#
-[Bootstrap]
-URE_INTERNAL_LIB_DIR=${ORIGIN}
-URE_INTERNAL_JAVA_DIR=${ORIGIN}/../java
-URE_INTERNAL_JAVA_CLASSPATH=${URE_MORE_JAVA_TYPES}
-UNO_TYPES=${ORIGIN}/../misc/types.rdb ${URE_MORE_TYPES}
-UNO_SERVICES=${ORIGIN}/../misc/services.rdb ${URE_MORE_SERVICES}