From 80090d1f1aa3e8bdb3ac144bd0b3464acbfff3a2 Mon Sep 17 00:00:00 2001
From: Michael Shigorin <mike@altlinux.org>
Date: Wed, 21 Mar 2012 15:55:24 +0200
Subject: [PATCH] minor tweaks (no functional changes)

Mostly multiline compactions, but also use/install2/net
got factored out from distro/server-ovz for future reuse.
---
 conf.d/desktop.mk              | 11 ++++-------
 conf.d/server.mk               |  3 +--
 features.in/install2/config.mk |  4 ++++
 image.in/vars.mk               |  2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/conf.d/desktop.mk b/conf.d/desktop.mk
index 1d9860e6..e0b0b0b7 100644
--- a/conf.d/desktop.mk
+++ b/conf.d/desktop.mk
@@ -1,17 +1,14 @@
 # desktop distributions
 ifeq (distro,$(IMAGE_CLASS))
 
-distro/.desktop-base: distro/.installer \
-	use/syslinux/ui-vesamenu use/x11/xorg
+distro/.desktop-base: distro/.installer use/syslinux/ui-vesamenu use/x11/xorg
 	@$(call set,INSTALLER,desktop)
 
-distro/.desktop-mini: distro/.desktop-base \
-	use/lowmem use/x11/xdm use/power/acpi/button \
-	use/cleanup/alterator; @:
+distro/.desktop-mini: distro/.desktop-base use/lowmem use/x11/xdm \
+	use/power/acpi/button use/cleanup/alterator; @:
 
 distro/tde: distro/.desktop-mini +tde
-	@$(call add,BASE_LISTS, \
-		$(call tags,(base || desktop) && network))
+	@$(call add,BASE_LISTS,$(call tags,(base || desktop) && network))
 
 distro/icewm: distro/.desktop-mini +icewm; @:
 distro/ltsp-icewm: distro/icewm +ltsp; @:
diff --git a/conf.d/server.mk b/conf.d/server.mk
index 9c54b2b6..46d32cfc 100644
--- a/conf.d/server.mk
+++ b/conf.d/server.mk
@@ -14,7 +14,7 @@ distro/server-mini: distro/.server-base use/cleanup/x11-alterator
 
 distro/server-systemd: distro/server-mini use/systemd use/bootloader/lilo; @:
 
-distro/server-ovz: distro/server-mini \
+distro/server-ovz: distro/server-mini use/install2/net \
 	use/hdt use/rescue use/firmware/server use/power/acpi/button
 	@$(call set,STAGE1_KFLAVOUR,std-def)
 	@$(call set,KFLAVOURS,std-def ovz-el)
@@ -22,7 +22,6 @@ distro/server-ovz: distro/server-mini \
 	@$(call add,MAIN_KMODULES,bcmwl ndiswrapper)
 	@$(call add,MAIN_KMODULES,ipset ipt-netflow opendpi pf_ring xtables-addons)
 	@$(call add,MAIN_KMODULES,drbd83 kvm)
-	@$(call add,INSTALL2_PACKAGES,curl)	### should become curl-mini
 	@$(call add,BASE_LISTS,ovz-server)
 	@$(call add,MAIN_LISTS,kernel-wifi)
 	@$(call add,MAIN_GROUPS,dns-server http-server ftp-server kvm-server)
diff --git a/features.in/install2/config.mk b/features.in/install2/config.mk
index 5bf6c687..62057efe 100644
--- a/features.in/install2/config.mk
+++ b/features.in/install2/config.mk
@@ -4,3 +4,7 @@ use/install2: use/stage2 sub/stage2/install2 use/cleanup/installer
 	@$(call add,INSTALL2_PACKAGES,branding-$$(BRANDING)-alterator)
 	@$(call add,BASE_PACKAGES,branding-$$(BRANDING)-release)
 	@$(call add,BASE_LISTS,$(call tags,basesystem))
+
+### FR: curl-mini
+use/install2/net: use/install2
+	@$(call add,INSTALL2_PACKAGES,curl)
diff --git a/image.in/vars.mk b/image.in/vars.mk
index f46c63bb..c8782671 100644
--- a/image.in/vars.mk
+++ b/image.in/vars.mk
@@ -10,7 +10,7 @@ PREFS := $(.VARIABLES)
 DISTCFG := $(.VARIABLES)
 
 # a separator variable
--- := --
+-- = --
 
 .PHONY: dump-vars