mixin.mk, distro.mk: move falkon to the distro itself

It is wrong to make it impossible to use the default browser (firefox) for targets using mixin/regular-lxqt given the caveat with setting a variable to X, then to Y, then to X again through make targets (see e.g. bootloader feature's README).

mixin.mk, distro.mk: move falkon to the distro itself
89c65ba9 · Anton Midyukov · Michael Shigorin · e42c9d8b · 89c65ba9 · 89c65ba9
Commit 89c65ba9 authored Jan 11, 2019 by Anton Midyukov Committed by Michael Shigorin Mar 04, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

mixin.mk conf.d/mixin.mk +1 -2

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

No files found.
--- a/conf.d/mixin.mk
+++ b/conf.d/mixin.mk
@@ -99,8 +99,7 @@ mixin/regular-tde: +tde \
 	@$(call add,THE_PACKAGES_REGEXP,kdeedu-kalzium.* kdeedu-ktouch.*)
 	@$(call add,DEFAULT_SERVICES_DISABLE,upower bluetoothd)

-mixin/regular-lxqt: use/x11/lxqt use/x11/sddm \
-	use/browser/falkon use/x11/gtk/nm +nm
+mixin/regular-lxqt: use/x11/lxqt use/x11/sddm use/x11/gtk/nm +nm
 	@$(call set,THE_IMAGEWRITER,rosa-imagewriter)

 mixin/regular-mate: use/x11/mate use/fonts/ttf/google use/x11/gtk/nm +nm

--- a/conf.d/regular.mk
+++ b/conf.d/regular.mk
@@ -171,7 +171,8 @@ distro/regular-kde4: distro/.regular-desktop use/x11/kde4/nm use/x11/kdm4 \
 	@$(call set,THE_IMAGEWRITER,rosa-imagewriter)
 	@$(call add,DEFAULT_SERVICES_ENABLE,prefdm)

-distro/regular-lxqt: distro/.regular-desktop mixin/regular-lxqt +plymouth; @:
+distro/regular-lxqt: distro/.regular-desktop mixin/regular-lxqt +plymouth \
+	use/browser/falkon; @:

 distro/regular-lxqt-sysv: distro/.regular-sysv mixin/regular-lxqt \
 	use/net-eth/dhcp use/efi/refind; @: