Commit 12206fbb authored by Michael Shigorin's avatar Michael Shigorin

regular.mk: generalize infinality font setup

It's been delegated to a fonts subfeature.
parent fa96c6be
# regular build/usage images # regular build/usage images
ifeq (distro,$(IMAGE_CLASS)) ifeq (distro,$(IMAGE_CLASS))
INFINALITY_PACKAGES := libfreetype-infinality fontconfig-infinality
# WM base target # WM base target
distro/.regular-base: distro/.base +live +wireless use/live/ru \ distro/.regular-base: distro/.base +live +wireless use/live/ru \
use/live/install use/live/repo use/live/net-eth use/x11/3d-free \ use/live/install use/live/repo use/live/net-eth use/x11/3d-free \
...@@ -31,8 +29,7 @@ distro/regular-icewm: distro/.regular-base use/x11/lightdm/gtk +icewm ...@@ -31,8 +29,7 @@ distro/regular-icewm: distro/.regular-base use/x11/lightdm/gtk +icewm
distro/regular-xfce: distro/.regular-gtk use/x11/xfce; @: 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 use/fonts/infinality
@$(call add,LIVE_PACKAGES,$(INFINALITY_PACKAGES))
@$(call add,LIVE_LISTS,$(call tags,desktop nm)) @$(call add,LIVE_LISTS,$(call tags,desktop nm))
distro/regular-mate: distro/.regular-gtk distro/regular-mate: distro/.regular-gtk
...@@ -41,9 +38,9 @@ distro/regular-mate: distro/.regular-gtk ...@@ -41,9 +38,9 @@ distro/regular-mate: distro/.regular-gtk
distro/regular-e17: distro/.regular-gtk use/x11/e17 distro/regular-e17: distro/.regular-gtk use/x11/e17
@$(call add,LIVE_PACKAGES,xterm) @$(call add,LIVE_PACKAGES,xterm)
distro/regular-cinnamon: distro/.regular-desktop use/x11/cinnamon distro/regular-cinnamon: distro/.regular-desktop \
use/x11/cinnamon use/fonts/infinality
@$(call set,META_VOL_ID,ALT Linux $(IMAGE_NAME)) # see also #28271 @$(call set,META_VOL_ID,ALT Linux $(IMAGE_NAME)) # see also #28271
@$(call add,LIVE_PACKAGES,$(INFINALITY_PACKAGES))
distro/regular-gnome3: distro/.regular-desktop use/x11/gnome3; @: distro/regular-gnome3: distro/.regular-desktop use/x11/gnome3; @:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment