From b45d2e7d144fb5fba8d38a85e3777287fd602e04 Mon Sep 17 00:00:00 2001
From: Matúš Kukan <matus.kukan@gmail.com>
Date: Mon, 17 Jun 2013 17:24:41 +0200
Subject: ure: install files with filelists

This commit adds gb_Package_add_symbolic_link.

Change-Id: I58511ede3da402464e60a4c45549c15c9c5dd1a5
---
 ure/Module_ure.mk           |  5 ++---
 ure/Package_distribution.mk | 20 --------------------
 ure/Package_install.mk      | 16 ++++++++++++++--
 ure/source/startup.sh       |  0
 4 files changed, 16 insertions(+), 25 deletions(-)
 delete mode 100644 ure/Package_distribution.mk
 mode change 100644 => 100755 ure/source/startup.sh

(limited to 'ure')

diff --git a/ure/Module_ure.mk b/ure/Module_ure.mk
index 2a48f32734eb..88cbc71b31f2 100644
--- a/ure/Module_ure.mk
+++ b/ure/Module_ure.mk
@@ -10,9 +10,8 @@
 $(eval $(call gb_Module_Module,ure))
 
 $(eval $(call gb_Module_add_targets,ure,\
-    Package_distribution \
-	$(if $(gb_RUNNABLE_INSTDIR),Package_install) \
-    Rdb_ure \
+	Package_install \
+	Rdb_ure \
 ))
 
 # vim:set noet sw=4 ts=4:
diff --git a/ure/Package_distribution.mk b/ure/Package_distribution.mk
deleted file mode 100644
index dd65277427eb..000000000000
--- a/ure/Package_distribution.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# 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/.
-#
-
-$(eval $(call gb_Package_Package,ure_distribution,$(SRCDIR)/ure/source))
-
-$(eval $(call gb_Package_add_file,ure_distribution,bin/ure/README,README))
-$(eval $(call gb_Package_add_file,ure_distribution,bin/ure/THIRDPARTYLICENSEREADME.html,THIRDPARTYLICENSEREADME.html))
-$(eval $(call gb_Package_add_file,ure_distribution,bin/ure/jvmfwk3.ini,jvmfwk3.ini))
-$(eval $(call gb_Package_add_file,ure_distribution,bin/ure/jvmfwk3rc,jvmfwk3rc))
-$(eval $(call gb_Package_add_file,ure_distribution,bin/ure/startup.sh,startup.sh))
-$(eval $(call gb_Package_add_file,ure_distribution,bin/ure/uno.ini,uno.ini))
-$(eval $(call gb_Package_add_file,ure_distribution,bin/ure/unorc,unorc))
-
-# vim:set noet sw=4 ts=4:
diff --git a/ure/Package_install.mk b/ure/Package_install.mk
index de48dd4c9dba..af4454d13c50 100644
--- a/ure/Package_install.mk
+++ b/ure/Package_install.mk
@@ -11,8 +11,20 @@ $(eval $(call gb_Package_Package,ure_install,$(SRCDIR)/ure/source))
 
 $(eval $(call gb_Package_set_outdir,ure_install,$(INSTDIR)))
 
+ifneq (WNT,$(OS))
 $(eval $(call gb_Package_add_file,ure_install,ure/bin/startup.sh,startup.sh))
-$(eval $(call gb_Package_add_file,ure_install,ure/lib/$(call gb_Helper_get_rcfile,jvmfwk3),jvmfwk3rc))
-$(eval $(call gb_Package_add_file,ure_install,ure/lib/$(call gb_Helper_get_rcfile,uno),unorc))
+$(eval $(call gb_Package_add_symbolic_link,ure_install,ure/bin/uno,startup.sh))
+endif
+
+ifeq (MACOSX,$(OS))
+$(eval $(call gb_Package_add_symbolic_link,ure_install,ure-link/bin/urelibs,../lib))
+else ifneq (WNT,$(OS))
+$(eval $(call gb_Package_add_symbolic_link,ure_install,ure-link,ure))
+endif
+
+$(eval $(call gb_Package_add_files,ure_install,$(LIBO_URE_LIB_FOLDER),\
+	$(call gb_Helper_get_rcfile,jvmfwk3) \
+	$(call gb_Helper_get_rcfile,uno) \
+))
 
 # vim:set noet sw=4 ts=4:
diff --git a/ure/source/startup.sh b/ure/source/startup.sh
old mode 100644
new mode 100755
-- 
cgit