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 --- desktop/Package_branding_custom.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'desktop/Package_branding_custom.mk') diff --git a/desktop/Package_branding_custom.mk b/desktop/Package_branding_custom.mk index 5713d3f8b367..eed749618cb7 100644 --- a/desktop/Package_branding_custom.mk +++ b/desktop/Package_branding_custom.mk @@ -9,7 +9,7 @@ $(eval $(call gb_Package_Package,desktop_branding_custom,$(CUSTOM_BRAND_DIR))) -$(eval $(call gb_Package_set_outdir,desktop_branding_custom,$(INSTDIR))) +$(eval $(call gb_Package_set_outdir,desktop_branding_custom,$(gb_INSTROOT))) $(eval $(call gb_Package_add_files,desktop_branding_custom,$(gb_PROGRAMDIRNAME),\ $(filter $(BRAND_INTRO_IMAGES),$(CUSTOM_BRAND_IMAGES)) \ -- cgit v1.2.3