From 5397b49f4dba9d065984a8b0eb356333c565217a Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Wed, 11 Sep 2013 00:42:52 +0200
Subject: Towards a working instdir for Mac OS X

Introduced gb_INSTROOT, which is the same as $(INSTDIR) except for Mac OS X,
where it is $(INSTDIR)/LibreOffice.app/Contents.  Most stuff ends up there (so
most occurrences of $(INSTDIR) have been replaced with $(gb_INSTROOT)), but SDK-
related stuff goes to $(INSTDIR)/$(gb_Package_SDKDIRNAME).  (And
GeneratedPackage needed to be made more flexible, to allow for packages that go
into either of those two places.)

For Android and iOS, gb_INSTROOT probably still needs to be set.

The most obvious missing thing yet to make instdir work for Mac OS X is the
instdir/*/LibreOffice.app/Contents/ure/ vs.
instdir/*/LibreOffice.app/Contents/ure-link/ split.

Change-Id: I4478edd27b14c92c96d92d5169bdca3ec50d78f5
---
 xmlhelp/Package_helpxsl.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'xmlhelp')

diff --git a/xmlhelp/Package_helpxsl.mk b/xmlhelp/Package_helpxsl.mk
index 79bd3abd3ad7..e9f3bf21965f 100644
--- a/xmlhelp/Package_helpxsl.mk
+++ b/xmlhelp/Package_helpxsl.mk
@@ -9,7 +9,7 @@
 
 $(eval $(call gb_Package_Package,xmlhelp_helpxsl,$(SRCDIR)/xmlhelp/util))
 
-$(eval $(call gb_Package_set_outdir,xmlhelp_helpxsl,$(INSTDIR)))
+$(eval $(call gb_Package_set_outdir,xmlhelp_helpxsl,$(gb_INSTROOT)))
 
 $(eval $(call gb_Package_add_files,xmlhelp_helpxsl,$(LIBO_SHARE_HELP_FOLDER),\
 	idxcaption.xsl \
-- 
cgit