alt-server.mk: put the horse before the tug

There was something wrong about that order of additives and the base configuration; let's make it straight, putting the foundation first and architecture-dependent additions on top of it. Note that double-colon syntax is specifically allowing for multiple rules adding up their recipes (and prereqs), but all of those rules must be specified as double-colon (this was violated in the previous state of alt-server.mk). See-also: http://www.gnu.org/software/make/manual/make.html#Double_002dColon Fixes: 33436b6b Fixes: c06f8753

alt-server.mk: put the horse before the tug
1aec6cee · Michael Shigorin · 181b7e84 · 1aec6cee
Commit 1aec6cee authored Aug 31, 2020 by Michael Shigorin
Hide whitespace changes
Inline Side-by-side

Showing with 14 additions and 13 deletions

alt-server.mk conf.d/alt-server.mk +14 -13

No files found.
--- a/conf.d/alt-server.mk
+++ b/conf.d/alt-server.mk
@@ -15,17 +15,9 @@ distro/alt-server: server_groups_desktop = $(addprefix centaurus/,\
        80-desktop emulators freenx-server mate office pidgin vlc xorg)
 endif

-ifeq (,$(filter-out x86_64 i586,$(ARCH)))
-distro/alt-server:: use/memtest
-endif
-
-ifeq (,$(filter-out x86_64 aarch64,$(ARCH)))
-distro/alt-server:: use/efi/refind +efi
-endif
-
-ifeq (,$(filter-out ppc64le aarch64 e2k%,$(ARCH)))
-distro/alt-server:: use/install2/vnc/listen; @:
-endif
+distro/alt-server: monitoring = $(addprefix server-v/,\
+	90-monitoring zabbix-agent telegraf prometheus-node_exporter \
+	monit collectd nagios-nrpe)

 # FIXME: generalize vm-profile
 distro/alt-server:: distro/.base mixin/alt-server use/vmguest/base \
@@ -59,7 +51,16 @@ ifeq (,$(filter-out e2kv4,$(ARCH)))
 	@$(call set,META_APP_ID,ALT Server for Elbrus-80x)
 endif

-distro/alt-server:: monitoring = $(addprefix server-v/, 90-monitoring \
-	zabbix-agent telegraf prometheus-node_exporter monit collectd nagios-nrpe)
+ifeq (,$(filter-out x86_64 i586,$(ARCH)))
+distro/alt-server:: use/memtest; @:
+endif
+
+ifeq (,$(filter-out x86_64 aarch64,$(ARCH)))
+distro/alt-server:: use/efi/refind +efi; @:
+endif
+
+ifeq (,$(filter-out ppc64le aarch64 e2k%,$(ARCH)))
+distro/alt-server:: use/install2/vnc/listen; @:
+endif

 endif