From 9433b9074ce4336f029de464e077caf0d7e9794b Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Fri, 6 Sep 2013 20:09:13 +0200 Subject: tweak previous commit hoping it will work on Mac ... ... plus some more fixes: - also install ure-link on WNT via Package not scp2. - also disable unorc in scp2 on WNT, otherwise cannot built instset due to duplicate file. - slso USE_INTERNAL_RIGHTS so startup.sh is executable. --- ure/Package_install.mk | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'ure/Package_install.mk') diff --git a/ure/Package_install.mk b/ure/Package_install.mk index af4454d13c50..62fce647005f 100644 --- a/ure/Package_install.mk +++ b/ure/Package_install.mk @@ -12,13 +12,19 @@ $(eval $(call gb_Package_Package,ure_install,$(SRCDIR)/ure/source)) $(eval $(call gb_Package_set_outdir,ure_install,$(INSTDIR))) ifneq (WNT,$(OS)) +ifeq ($(ENABLE_MACOSX_MACLIKE_APP_STRUCTURE),) $(eval $(call gb_Package_add_file,ure_install,ure/bin/startup.sh,startup.sh)) $(eval $(call gb_Package_add_symbolic_link,ure_install,ure/bin/uno,startup.sh)) endif +endif ifeq (MACOSX,$(OS)) -$(eval $(call gb_Package_add_symbolic_link,ure_install,ure-link/bin/urelibs,../lib)) -else ifneq (WNT,$(OS)) +ifeq ($(ENABLE_MACOSX_MACLIKE_APP_STRUCTURE),) +$(eval $(call gb_Package_add_symbolic_link,ure_install,Contents/MacOS/urelibs,../ure-link/lib)) +endif +else ifeq (WNT,$(OS)) +$(eval $(call gb_Package_add_file,ure_install,ure-link,ure-link)) +else $(eval $(call gb_Package_add_symbolic_link,ure_install,ure-link,ure)) endif -- cgit