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 --- liblangtag/ExternalPackage_liblangtag_data.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'liblangtag') diff --git a/liblangtag/ExternalPackage_liblangtag_data.mk b/liblangtag/ExternalPackage_liblangtag_data.mk index 54790a178841..4f8510cb4b29 100644 --- a/liblangtag/ExternalPackage_liblangtag_data.mk +++ b/liblangtag/ExternalPackage_liblangtag_data.mk @@ -9,7 +9,7 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,liblangtag_data,langtag)) -$(eval $(call gb_ExternalPackage_set_outdir,liblangtag_data,$(INSTDIR))) +$(eval $(call gb_ExternalPackage_set_outdir,liblangtag_data,$(gb_INSTROOT))) $(eval $(call gb_ExternalPackage_add_unpacked_files,liblangtag_data,$(LIBO_SHARE_FOLDER)/liblangtag,\ data/language-subtag-registry.xml \ -- cgit