[Libreoffice-commits] core.git: solenv/gbuild

Stephan Bergmann sbergman at redhat.com
Tue Jan 21 01:58:25 PST 2014


 solenv/gbuild/UnoApi.mk |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit f4ccd054a94de1290e01bd21d5d45f1720f7cb74
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Jan 21 10:56:08 2014 +0100

    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

diff --git a/solenv/gbuild/UnoApi.mk b/solenv/gbuild/UnoApi.mk
index 52028d5..d99195d 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


More information about the Libreoffice-commits mailing list