summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2014-01-21 10:56:08 +0100
committerMichael Stahl <mstahl@redhat.com>2014-01-21 13:19:53 +0000
commit460f5cab4105451d86451c63be7891be41974911 (patch)
treecf996b8743d3c2f30db33312c73f63056ece6156
parent23221e48495262d0384c9169a0d8a01db8a5dab5 (diff)
idl files need to be packaged relative to INSTDIR, not INSTROOT
...so that on OS X they end up in LibreOffice*_SDK.app/idl/, not LibreOffice.app/Contents/LibreOffice*_SDK.app/idl/. Change-Id: Id001aed334a0e1d8f835ce797a17f1f67d1a3abb (cherry picked from commit f4ccd054a94de1290e01bd21d5d45f1720f7cb74) Reviewed-on: https://gerrit.libreoffice.org/7569 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
-rw-r--r--solenv/gbuild/UnoApi.mk1
1 files changed, 1 insertions, 0 deletions
diff --git a/solenv/gbuild/UnoApi.mk b/solenv/gbuild/UnoApi.mk
index 21ce4d6b14d6..6e39b3d133ab 100644
--- a/solenv/gbuild/UnoApi.mk
+++ b/solenv/gbuild/UnoApi.mk
@@ -20,6 +20,7 @@ $(call gb_UnoApiTarget_UnoApiTarget,$(1),$(1))
$(call gb_UnoApiHeadersTarget_UnoApiHeadersTarget,$(1))
ifneq ($(gb_UnoApi_ENABLE_INSTALL),)
$(call gb_Package_Package_internal,$(1)_idl,$(SRCDIR))
+$(call gb_Package_set_outdir,$(1)_idl,$(INSTDIR))
endif
$(call gb_UnoApi_get_target,$(1)) :| $(dir $(call gb_UnoApi_get_target,$(1))).dir