regular.mk: added fontconfig-infinality to lxde

...and refactored its use in cinnamon image too; this isn't a permanent solution though, slated to move into fonts feature. Thanks gns@ for suggestion.

regular.mk: added fontconfig-infinality to lxde
240907f5 · Michael Shigorin · 57ddb85d · 240907f5
Commit 240907f5 authored Feb 26, 2013 by Michael Shigorin
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 2 deletions

regular.mk conf.d/regular.mk +6 -2

No files found.
--- a/conf.d/regular.mk
+++ b/conf.d/regular.mk
 # regular build/usage images
 ifeq (distro,$(IMAGE_CLASS))

+INFINALITY_PACKAGES := libfreetype-infinality fontconfig-infinality
+
 # WM base target
 distro/.regular-base: distro/.base +live +wireless use/live/ru \
 	use/live/install use/live/repo use/live/net-eth use/x11/3d-free \
@@ -28,7 +30,9 @@ distro/regular-icewm: distro/.regular-base use/x11/lightdm/gtk +icewm
 	@$(call set,KFLAVOURS,un-def)

 distro/regular-xfce: distro/.regular-gtk use/x11/xfce; @:
-distro/regular-lxde: distro/.regular-gtk use/x11/lxde; @:
+
+distro/regular-lxde: distro/.regular-gtk use/x11/lxde
+	@$(call add,LIVE_PACKAGES,$(INFINALITY_PACKAGES))

 distro/regular-mate: distro/.regular-gtk
 	@$(call add,LIVE_LISTS,$(call tags,(desktop || mobile) && (mate || nm)))
@@ -38,7 +42,7 @@ distro/regular-e17: distro/.regular-gtk use/x11/e17

 distro/regular-cinnamon: distro/.regular-desktop use/x11/cinnamon
 	@$(call set,META_VOL_ID,ALT Linux $(IMAGE_NAME)) # see also #28271
-	@$(call add,LIVE_PACKAGES,fontconfig-infinality)
+	@$(call add,LIVE_PACKAGES,$(INFINALITY_PACKAGES))

 distro/regular-gnome3: distro/.regular-desktop use/x11/gnome3; @: