install fonts using filelists

Change-Id: I1312908e2039a9836d25ec3a558f9ef78abf177e

10 files changed, 30 insertions, 10 deletions

diff --git a/more_fonts/ExternalPackage_dejavu.mk b/more_fonts/ExternalPackage_dejavu.mk
index ad09fcf337fe..ad40182f7d18 100644
--- a/more_fonts/ExternalPackage_dejavu.mk
+++ b/more_fonts/ExternalPackage_dejavu.mk
@@ -9,7 +9,9 @@
 
 $(eval $(call gb_ExternalPackage_ExternalPackage,fonts_dejavu,font_dejavu))
 
-$(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_dejavu,pck,\
+$(eval $(call gb_ExternalPackage_set_outdir,fonts_dejavu,$(INSTDIR)))
+
+$(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_dejavu,share/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 40c65b8c0655..0cf551fa504b 100644
--- a/more_fonts/ExternalPackage_gentium.mk
+++ b/more_fonts/ExternalPackage_gentium.mk
@@ -9,7 +9,9 @@
 
 $(eval $(call gb_ExternalPackage_ExternalPackage,fonts_gentium,font_gentium))
 
-$(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_gentium,pck,\
+$(eval $(call gb_ExternalPackage_set_outdir,fonts_gentium,$(INSTDIR)))
+
+$(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_gentium,share/fonts/truetype,\
 	GenBasB.ttf \
 	GenBasBI.ttf \
 	GenBasI.ttf \
diff --git a/more_fonts/ExternalPackage_liberation.mk b/more_fonts/ExternalPackage_liberation.mk
index e191b3a332ec..21015e25ef10 100644
--- a/more_fonts/ExternalPackage_liberation.mk
+++ b/more_fonts/ExternalPackage_liberation.mk
@@ -9,7 +9,9 @@
 
 $(eval $(call gb_ExternalPackage_ExternalPackage,fonts_liberation,font_liberation))
 
-$(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_liberation,pck,\
+$(eval $(call gb_ExternalPackage_set_outdir,fonts_liberation,$(INSTDIR)))
+
+$(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_liberation,share/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 09dc0a31b151..74c6b569a434 100644
--- a/more_fonts/ExternalPackage_liberation_narrow.mk
+++ b/more_fonts/ExternalPackage_liberation_narrow.mk
@@ -9,7 +9,9 @@
 
 $(eval $(call gb_ExternalPackage_ExternalPackage,fonts_liberation_narrow,font_liberation_narrow))
 
-$(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_liberation_narrow,pck,\
+$(eval $(call gb_ExternalPackage_set_outdir,fonts_liberation_narrow,$(INSTDIR)))
+
+$(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_liberation_narrow,share/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 cc4aaa8cc098..7064ca934925 100644
--- a/more_fonts/ExternalPackage_libertineg.mk
+++ b/more_fonts/ExternalPackage_libertineg.mk
@@ -9,7 +9,9 @@
 
 $(eval $(call gb_ExternalPackage_ExternalPackage,fonts_libertineg,font_libertineg))
 
-$(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_libertineg,pck,\
+$(eval $(call gb_ExternalPackage_set_outdir,fonts_libertineg,$(INSTDIR)))
+
+$(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_libertineg,share/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 6aa13647337b..92d15e7fa84b 100644
--- a/more_fonts/ExternalPackage_opensans.mk
+++ b/more_fonts/ExternalPackage_opensans.mk
@@ -9,7 +9,9 @@
 
 $(eval $(call gb_ExternalPackage_ExternalPackage,fonts_opensans,font_opensans))
 
-$(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_opensans,pck,\
+$(eval $(call gb_ExternalPackage_set_outdir,fonts_opensans,$(INSTDIR)))
+
+$(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_opensans,share/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 c0507eeb4b50..9f978d62b812 100644
--- a/more_fonts/ExternalPackage_ptserif.mk
+++ b/more_fonts/ExternalPackage_ptserif.mk
@@ -9,7 +9,9 @@
 
 $(eval $(call gb_ExternalPackage_ExternalPackage,fonts_ptserif,font_ptserif))
 
-$(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_ptserif,pck,\
+$(eval $(call gb_ExternalPackage_set_outdir,fonts_ptserif,$(INSTDIR)))
+
+$(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_ptserif,share/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 19a9c9425dae..42aa79eda3da 100644
--- a/more_fonts/ExternalPackage_sourcecode.mk
+++ b/more_fonts/ExternalPackage_sourcecode.mk
@@ -9,7 +9,9 @@
 
 $(eval $(call gb_ExternalPackage_ExternalPackage,fonts_sourcecode,font_sourcecode))
 
-$(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_sourcecode,pck,\
+$(eval $(call gb_ExternalPackage_set_outdir,fonts_sourcecode,$(INSTDIR)))
+
+$(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_sourcecode,share/fonts/truetype,\
 	SourceCodePro-Bold.ttf \
 	SourceCodePro-Regular.ttf \
 ))
diff --git a/more_fonts/ExternalPackage_sourcesans.mk b/more_fonts/ExternalPackage_sourcesans.mk
index 65f2de9389e2..da53e4a32733 100644
--- a/more_fonts/ExternalPackage_sourcesans.mk
+++ b/more_fonts/ExternalPackage_sourcesans.mk
@@ -9,7 +9,9 @@
 
 $(eval $(call gb_ExternalPackage_ExternalPackage,fonts_sourcesans,font_sourcesans))
 
-$(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_sourcesans,pck,\
+$(eval $(call gb_ExternalPackage_set_outdir,fonts_sourcesans,$(INSTDIR)))
+
+$(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_sourcesans,share/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 c6d48d09ed94..f5c03fc0ff1a 100644
--- a/more_fonts/Package_conf.mk
+++ b/more_fonts/Package_conf.mk
@@ -9,6 +9,8 @@
 
 $(eval $(call gb_Package_Package,more_fonts_conf,$(SRCDIR)/more_fonts/fonts))
 
-$(eval $(call gb_Package_add_file,more_fonts_conf,pck/fc_local.conf,fc_local.conf))
+$(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))
 
 # vim: set noet sw=4 ts=4: