diff options
author | Tor Lillqvist <tml@iki.fi> | 2013-08-18 18:45:45 +0200 |
---|---|---|
committer | Tor Lillqvist <tml@iki.fi> | 2013-08-18 21:11:16 +0300 |
commit | 058a3d1c46449dd5159bae30c83db4c2c5c335b4 (patch) | |
tree | 28fae22c49b9cecdda52aa148dde2aba2b568ff9 /more_fonts | |
parent | bd2f7ef662122d5c1202911cb2f3b0ab1e124695 (diff) |
Further work on the "Mac-like app structure" option
Lots of stuff still either ended up in the wrong place, or was looked up from
the wrong place, or both. Fix most cases.
Change-Id: I06ebbce207c219f3cd82b4387dd9b3fdb83420d4
Diffstat (limited to 'more_fonts')
-rw-r--r-- | more_fonts/ExternalPackage_dejavu.mk | 2 | ||||
-rw-r--r-- | more_fonts/ExternalPackage_gentium.mk | 2 | ||||
-rw-r--r-- | more_fonts/ExternalPackage_liberation.mk | 2 | ||||
-rw-r--r-- | more_fonts/ExternalPackage_liberation_narrow.mk | 2 | ||||
-rw-r--r-- | more_fonts/ExternalPackage_libertineg.mk | 2 | ||||
-rw-r--r-- | more_fonts/ExternalPackage_opensans.mk | 2 | ||||
-rw-r--r-- | more_fonts/ExternalPackage_ptserif.mk | 2 | ||||
-rw-r--r-- | more_fonts/ExternalPackage_sourcecode.mk | 2 | ||||
-rw-r--r-- | more_fonts/ExternalPackage_sourcesans.mk | 2 | ||||
-rw-r--r-- | more_fonts/Package_conf.mk | 2 |
10 files changed, 10 insertions, 10 deletions
diff --git a/more_fonts/ExternalPackage_dejavu.mk b/more_fonts/ExternalPackage_dejavu.mk index ad40182f7d18..71e42e89a987 100644 --- a/more_fonts/ExternalPackage_dejavu.mk +++ b/more_fonts/ExternalPackage_dejavu.mk @@ -11,7 +11,7 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,fonts_dejavu,font_dejavu)) $(eval $(call gb_ExternalPackage_set_outdir,fonts_dejavu,$(INSTDIR))) -$(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_dejavu,share/fonts/truetype,\ +$(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_dejavu,$(LIBO_SHARE_FOLDER)/fonts/truetype,\ ttf/DejaVuSans-Bold.ttf \ ttf/DejaVuSans-BoldOblique.ttf \ ttf/DejaVuSans-ExtraLight.ttf \ diff --git a/more_fonts/ExternalPackage_gentium.mk b/more_fonts/ExternalPackage_gentium.mk index 0cf551fa504b..2293e74599f3 100644 --- a/more_fonts/ExternalPackage_gentium.mk +++ b/more_fonts/ExternalPackage_gentium.mk @@ -11,7 +11,7 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,fonts_gentium,font_gentium)) $(eval $(call gb_ExternalPackage_set_outdir,fonts_gentium,$(INSTDIR))) -$(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_gentium,share/fonts/truetype,\ +$(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_gentium,$(LIBO_SHARE_FOLDER)/fonts/truetype,\ GenBasB.ttf \ GenBasBI.ttf \ GenBasI.ttf \ diff --git a/more_fonts/ExternalPackage_liberation.mk b/more_fonts/ExternalPackage_liberation.mk index 21015e25ef10..9fdd5945323d 100644 --- a/more_fonts/ExternalPackage_liberation.mk +++ b/more_fonts/ExternalPackage_liberation.mk @@ -11,7 +11,7 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,fonts_liberation,font_liberatio $(eval $(call gb_ExternalPackage_set_outdir,fonts_liberation,$(INSTDIR))) -$(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_liberation,share/fonts/truetype,\ +$(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_liberation,$(LIBO_SHARE_FOLDER)/fonts/truetype,\ LiberationMono-Bold.ttf \ LiberationMono-BoldItalic.ttf \ LiberationMono-Italic.ttf \ diff --git a/more_fonts/ExternalPackage_liberation_narrow.mk b/more_fonts/ExternalPackage_liberation_narrow.mk index 74c6b569a434..60c4cc4a52a6 100644 --- a/more_fonts/ExternalPackage_liberation_narrow.mk +++ b/more_fonts/ExternalPackage_liberation_narrow.mk @@ -11,7 +11,7 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,fonts_liberation_narrow,font_li $(eval $(call gb_ExternalPackage_set_outdir,fonts_liberation_narrow,$(INSTDIR))) -$(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_liberation_narrow,share/fonts/truetype,\ +$(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_liberation_narrow,$(LIBO_SHARE_FOLDER)/fonts/truetype,\ LiberationSansNarrow-Bold.ttf \ LiberationSansNarrow-BoldItalic.ttf \ LiberationSansNarrow-Italic.ttf \ diff --git a/more_fonts/ExternalPackage_libertineg.mk b/more_fonts/ExternalPackage_libertineg.mk index 7064ca934925..17a08a04594e 100644 --- a/more_fonts/ExternalPackage_libertineg.mk +++ b/more_fonts/ExternalPackage_libertineg.mk @@ -11,7 +11,7 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,fonts_libertineg,font_libertine $(eval $(call gb_ExternalPackage_set_outdir,fonts_libertineg,$(INSTDIR))) -$(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_libertineg,share/fonts/truetype,\ +$(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_libertineg,$(LIBO_SHARE_FOLDER)/fonts/truetype,\ LinBiolinum_RB_G.ttf \ LinBiolinum_RI_G.ttf \ LinBiolinum_R_G.ttf \ diff --git a/more_fonts/ExternalPackage_opensans.mk b/more_fonts/ExternalPackage_opensans.mk index 92d15e7fa84b..718e729a91b1 100644 --- a/more_fonts/ExternalPackage_opensans.mk +++ b/more_fonts/ExternalPackage_opensans.mk @@ -11,7 +11,7 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,fonts_opensans,font_opensans)) $(eval $(call gb_ExternalPackage_set_outdir,fonts_opensans,$(INSTDIR))) -$(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_opensans,share/fonts/truetype,\ +$(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_opensans,$(LIBO_SHARE_FOLDER)/fonts/truetype,\ OpenSans-BoldItalic.ttf \ OpenSans-Bold.ttf \ OpenSans-Italic.ttf \ diff --git a/more_fonts/ExternalPackage_ptserif.mk b/more_fonts/ExternalPackage_ptserif.mk index 9f978d62b812..6e6e7a4a6dc0 100644 --- a/more_fonts/ExternalPackage_ptserif.mk +++ b/more_fonts/ExternalPackage_ptserif.mk @@ -11,7 +11,7 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,fonts_ptserif,font_ptserif)) $(eval $(call gb_ExternalPackage_set_outdir,fonts_ptserif,$(INSTDIR))) -$(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_ptserif,share/fonts/truetype,\ +$(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_ptserif,$(LIBO_SHARE_FOLDER)/fonts/truetype,\ PT_Serif-Web-BoldItalic.ttf \ PT_Serif-Web-Bold.ttf \ PT_Serif-Web-Italic.ttf \ diff --git a/more_fonts/ExternalPackage_sourcecode.mk b/more_fonts/ExternalPackage_sourcecode.mk index 42aa79eda3da..5ddb08dc82e6 100644 --- a/more_fonts/ExternalPackage_sourcecode.mk +++ b/more_fonts/ExternalPackage_sourcecode.mk @@ -11,7 +11,7 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,fonts_sourcecode,font_sourcecod $(eval $(call gb_ExternalPackage_set_outdir,fonts_sourcecode,$(INSTDIR))) -$(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_sourcecode,share/fonts/truetype,\ +$(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_sourcecode,$(LIBO_SHARE_FOLDER)/fonts/truetype,\ SourceCodePro-Bold.ttf \ SourceCodePro-Regular.ttf \ )) diff --git a/more_fonts/ExternalPackage_sourcesans.mk b/more_fonts/ExternalPackage_sourcesans.mk index da53e4a32733..7ba1945cad19 100644 --- a/more_fonts/ExternalPackage_sourcesans.mk +++ b/more_fonts/ExternalPackage_sourcesans.mk @@ -11,7 +11,7 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,fonts_sourcesans,font_sourcesan $(eval $(call gb_ExternalPackage_set_outdir,fonts_sourcesans,$(INSTDIR))) -$(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_sourcesans,share/fonts/truetype,\ +$(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_sourcesans,$(LIBO_SHARE_FOLDER)/fonts/truetype,\ SourceSansPro-BoldItalic.ttf \ SourceSansPro-Bold.ttf \ SourceSansPro-Italic.ttf \ diff --git a/more_fonts/Package_conf.mk b/more_fonts/Package_conf.mk index f5c03fc0ff1a..627afc06f2b6 100644 --- a/more_fonts/Package_conf.mk +++ b/more_fonts/Package_conf.mk @@ -11,6 +11,6 @@ $(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_add_file,more_fonts_conf,share/fonts/truetype/fc_local.conf,fc_local.conf)) +$(eval $(call gb_Package_add_file,more_fonts_conf,$(LIBO_SHARE_FOLDER)/fonts/truetype/fc_local.conf,fc_local.conf)) # vim: set noet sw=4 ts=4: |