From 61ecd095bbcd55e04b52a6e56ad6a6f5e2f2656b Mon Sep 17 00:00:00 2001 From: Michael Shigorin Date: Tue, 11 Jun 2013 15:24:29 +0000 Subject: [PATCH] x11: added use/x11/mate target It was implemented in a pretty quick-and-dirty way for regular-mate back then, clean things up a bit. Package lists should be deduplicated either but that's another story. --- conf.d/regular.mk | 5 +++-- features.in/x11/config.mk | 3 +++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/conf.d/regular.mk b/conf.d/regular.mk index 656de7d1..54dbdaa2 100644 --- a/conf.d/regular.mk +++ b/conf.d/regular.mk @@ -51,8 +51,9 @@ distro/regular-lxde: distro/.regular-gtk use/x11/lxde use/fonts/infinality distro/regular-xmonad: distro/.regular-gtk use/x11/xmonad @$(call add,LIVE_PACKAGES,livecd-regular-xmonad) -distro/regular-mate: distro/.regular-gtk - @$(call add,LIVE_LISTS,$(call tags,(desktop || mobile) && (mate || nm))) +distro/regular-mate: distro/.regular-gtk use/x11/mate + @$(call add,LIVE_LISTS,$(call tags,mobile mate)) + @$(call add,LIVE_LISTS,$(call tags,desktop nm)) ### +nm? distro/regular-e17: distro/.regular-gtk use/x11/e17 use/fonts/infinality @$(call add,LIVE_PACKAGES,xterm) diff --git a/features.in/x11/config.mk b/features.in/x11/config.mk index 62f9ab39..8a3d3d24 100644 --- a/features.in/x11/config.mk +++ b/features.in/x11/config.mk @@ -107,3 +107,6 @@ use/x11/gnustep: use/x11 use/x11/xmonad: use/x11 @$(call add,THE_LISTS,$(call tags,xmonad desktop)) + +use/x11/mate: use/x11 + @$(call add,THE_LISTS,$(call tags,mate desktop))