diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-09-06 20:09:13 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-09-09 22:09:02 +0200 |
| commit | 9433b9074ce4336f029de464e077caf0d7e9794b (patch) | |
| tree | 4dcc0883c0c171949348a767a7c1f1a01567c72f /ure | |
| parent | b45d2e7d144fb5fba8d38a85e3777287fd602e04 (diff) | |
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.
Diffstat (limited to 'ure')
| -rw-r--r-- | ure/Package_install.mk | 10 | ||||
| -rw-r--r-- | ure/source/ure-link | 1 |
2 files changed, 9 insertions, 2 deletions
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 diff --git a/ure/source/ure-link b/ure/source/ure-link new file mode 100644 index 000000000000..122de345e91f --- /dev/null +++ b/ure/source/ure-link @@ -0,0 +1 @@ +URE
\ No newline at end of file |