From 5397b49f4dba9d065984a8b0eb356333c565217a Mon Sep 17 00:00:00 2001 From: Stephan Bergmann 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 --- wizards/Package_template.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'wizards/Package_template.mk') diff --git a/wizards/Package_template.mk b/wizards/Package_template.mk index cfbb150b96bd..1d9225e84225 100644 --- a/wizards/Package_template.mk +++ b/wizards/Package_template.mk @@ -19,7 +19,7 @@ $(eval $(call gb_Package_Package,wizards_basicsrvtemplate,$(SRCDIR)/wizards/source/template)) -$(eval $(call gb_Package_set_outdir,wizards_basicsrvtemplate,$(INSTDIR))) +$(eval $(call gb_Package_set_outdir,wizards_basicsrvtemplate,$(gb_INSTROOT))) $(eval $(call gb_Package_add_files,wizards_basicsrvtemplate,$(LIBO_SHARE_FOLDER)/basic/Template,\ Autotext.xba \ -- cgit