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 --- more_fonts/ExternalPackage_dejavu.mk | 2 +- more_fonts/ExternalPackage_gentium.mk | 2 +- more_fonts/ExternalPackage_liberation.mk | 2 +- more_fonts/ExternalPackage_liberation_narrow.mk | 2 +- more_fonts/ExternalPackage_libertineg.mk | 2 +- more_fonts/ExternalPackage_opensans.mk | 2 +- more_fonts/ExternalPackage_ptserif.mk | 2 +- more_fonts/ExternalPackage_sourcecode.mk | 2 +- more_fonts/ExternalPackage_sourcesans.mk | 2 +- more_fonts/Package_conf.mk | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) (limited to 'more_fonts') diff --git a/more_fonts/ExternalPackage_dejavu.mk b/more_fonts/ExternalPackage_dejavu.mk index 71e42e89a987..447c72c9ba88 100644 --- a/more_fonts/ExternalPackage_dejavu.mk +++ b/more_fonts/ExternalPackage_dejavu.mk @@ -9,7 +9,7 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,fonts_dejavu,font_dejavu)) -$(eval $(call gb_ExternalPackage_set_outdir,fonts_dejavu,$(INSTDIR))) +$(eval $(call gb_ExternalPackage_set_outdir,fonts_dejavu,$(gb_INSTROOT))) $(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_dejavu,$(LIBO_SHARE_FOLDER)/fonts/truetype,\ ttf/DejaVuSans-Bold.ttf \ diff --git a/more_fonts/ExternalPackage_gentium.mk b/more_fonts/ExternalPackage_gentium.mk index 2293e74599f3..4b0138acf409 100644 --- a/more_fonts/ExternalPackage_gentium.mk +++ b/more_fonts/ExternalPackage_gentium.mk @@ -9,7 +9,7 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,fonts_gentium,font_gentium)) -$(eval $(call gb_ExternalPackage_set_outdir,fonts_gentium,$(INSTDIR))) +$(eval $(call gb_ExternalPackage_set_outdir,fonts_gentium,$(gb_INSTROOT))) $(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_gentium,$(LIBO_SHARE_FOLDER)/fonts/truetype,\ GenBasB.ttf \ diff --git a/more_fonts/ExternalPackage_liberation.mk b/more_fonts/ExternalPackage_liberation.mk index 9fdd5945323d..76fd346e2300 100644 --- a/more_fonts/ExternalPackage_liberation.mk +++ b/more_fonts/ExternalPackage_liberation.mk @@ -9,7 +9,7 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,fonts_liberation,font_liberation)) -$(eval $(call gb_ExternalPackage_set_outdir,fonts_liberation,$(INSTDIR))) +$(eval $(call gb_ExternalPackage_set_outdir,fonts_liberation,$(gb_INSTROOT))) $(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_liberation,$(LIBO_SHARE_FOLDER)/fonts/truetype,\ LiberationMono-Bold.ttf \ diff --git a/more_fonts/ExternalPackage_liberation_narrow.mk b/more_fonts/ExternalPackage_liberation_narrow.mk index 60c4cc4a52a6..e72fa4e43725 100644 --- a/more_fonts/ExternalPackage_liberation_narrow.mk +++ b/more_fonts/ExternalPackage_liberation_narrow.mk @@ -9,7 +9,7 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,fonts_liberation_narrow,font_liberation_narrow)) -$(eval $(call gb_ExternalPackage_set_outdir,fonts_liberation_narrow,$(INSTDIR))) +$(eval $(call gb_ExternalPackage_set_outdir,fonts_liberation_narrow,$(gb_INSTROOT))) $(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_liberation_narrow,$(LIBO_SHARE_FOLDER)/fonts/truetype,\ LiberationSansNarrow-Bold.ttf \ diff --git a/more_fonts/ExternalPackage_libertineg.mk b/more_fonts/ExternalPackage_libertineg.mk index 17a08a04594e..279a87f1f0d6 100644 --- a/more_fonts/ExternalPackage_libertineg.mk +++ b/more_fonts/ExternalPackage_libertineg.mk @@ -9,7 +9,7 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,fonts_libertineg,font_libertineg)) -$(eval $(call gb_ExternalPackage_set_outdir,fonts_libertineg,$(INSTDIR))) +$(eval $(call gb_ExternalPackage_set_outdir,fonts_libertineg,$(gb_INSTROOT))) $(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_libertineg,$(LIBO_SHARE_FOLDER)/fonts/truetype,\ LinBiolinum_RB_G.ttf \ diff --git a/more_fonts/ExternalPackage_opensans.mk b/more_fonts/ExternalPackage_opensans.mk index 718e729a91b1..d0c4636b016a 100644 --- a/more_fonts/ExternalPackage_opensans.mk +++ b/more_fonts/ExternalPackage_opensans.mk @@ -9,7 +9,7 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,fonts_opensans,font_opensans)) -$(eval $(call gb_ExternalPackage_set_outdir,fonts_opensans,$(INSTDIR))) +$(eval $(call gb_ExternalPackage_set_outdir,fonts_opensans,$(gb_INSTROOT))) $(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_opensans,$(LIBO_SHARE_FOLDER)/fonts/truetype,\ OpenSans-BoldItalic.ttf \ diff --git a/more_fonts/ExternalPackage_ptserif.mk b/more_fonts/ExternalPackage_ptserif.mk index 6e6e7a4a6dc0..2c868f5a2b0c 100644 --- a/more_fonts/ExternalPackage_ptserif.mk +++ b/more_fonts/ExternalPackage_ptserif.mk @@ -9,7 +9,7 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,fonts_ptserif,font_ptserif)) -$(eval $(call gb_ExternalPackage_set_outdir,fonts_ptserif,$(INSTDIR))) +$(eval $(call gb_ExternalPackage_set_outdir,fonts_ptserif,$(gb_INSTROOT))) $(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_ptserif,$(LIBO_SHARE_FOLDER)/fonts/truetype,\ PT_Serif-Web-BoldItalic.ttf \ diff --git a/more_fonts/ExternalPackage_sourcecode.mk b/more_fonts/ExternalPackage_sourcecode.mk index 5ddb08dc82e6..8cf75d658f17 100644 --- a/more_fonts/ExternalPackage_sourcecode.mk +++ b/more_fonts/ExternalPackage_sourcecode.mk @@ -9,7 +9,7 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,fonts_sourcecode,font_sourcecode)) -$(eval $(call gb_ExternalPackage_set_outdir,fonts_sourcecode,$(INSTDIR))) +$(eval $(call gb_ExternalPackage_set_outdir,fonts_sourcecode,$(gb_INSTROOT))) $(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_sourcecode,$(LIBO_SHARE_FOLDER)/fonts/truetype,\ SourceCodePro-Bold.ttf \ diff --git a/more_fonts/ExternalPackage_sourcesans.mk b/more_fonts/ExternalPackage_sourcesans.mk index 7ba1945cad19..4d7f769cac2c 100644 --- a/more_fonts/ExternalPackage_sourcesans.mk +++ b/more_fonts/ExternalPackage_sourcesans.mk @@ -9,7 +9,7 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,fonts_sourcesans,font_sourcesans)) -$(eval $(call gb_ExternalPackage_set_outdir,fonts_sourcesans,$(INSTDIR))) +$(eval $(call gb_ExternalPackage_set_outdir,fonts_sourcesans,$(gb_INSTROOT))) $(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_sourcesans,$(LIBO_SHARE_FOLDER)/fonts/truetype,\ SourceSansPro-BoldItalic.ttf \ diff --git a/more_fonts/Package_conf.mk b/more_fonts/Package_conf.mk index 627afc06f2b6..a81534c87d50 100644 --- a/more_fonts/Package_conf.mk +++ b/more_fonts/Package_conf.mk @@ -9,7 +9,7 @@ $(eval $(call gb_Package_Package,more_fonts_conf,$(SRCDIR)/more_fonts/fonts)) -$(eval $(call gb_Package_set_outdir,more_fonts_conf,$(INSTDIR))) +$(eval $(call gb_Package_set_outdir,more_fonts_conf,$(gb_INSTROOT))) $(eval $(call gb_Package_add_file,more_fonts_conf,$(LIBO_SHARE_FOLDER)/fonts/truetype/fc_local.conf,fc_local.conf)) -- cgit