zabbix: fix compile skipped due to line continuation

Using line continuation (\\) in GNU Make \$(foreach ...) and
\$(call ...) resulted in the install section for many of the packages
not being defined. This resulted in 'skipping [package-name] no install
section' messages and no new package being generated.

We remove the line continuation from the parts foreach and call, in
ordeer to restore compilation and creation of packages.

Signed-off-by: Daniel F. Dickinson <redacted>

diff --git a/admin/zabbix/Makefile b/admin/zabbix/Makefile
index e447599e783bfb2c36bd15147762cbb93d12e3eb..4c4af46324cc2b18ae8394af9b53d022d669ad7c 100644 (file)
--- a/admin/zabbix/Makefile
+++ b/admin/zabbix/Makefile
@@ -451,19 +451,9 @@ define Package/zabbix-server/install-extra
        $(INSTALL_BIN) ./files/zabbix_server.defaults $$(1)/etc/uci-defaults/90_zabbix_server
 endef
 
-$(foreach zvariant,nossl openssl gnutls,\
-  $(eval $(call Package/zabbix-daemon/files,agentd,\
-    $(zvariant),\
-    ,\
-    $(call Package/zabbix-agentd/install-extra))))
-$(foreach zvariant,nossl openssl gnutls,\
-  $(eval $(call Package/zabbix-daemon/files,server,\
-    $(zvariant),\
-    $(call Package/zabbix-server/conffiles-extra),\
-    $(call Package/zabbix-server/install-extra))))
-$(foreach zvariant,nossl openssl gnutls,\
-  $(eval $(call Package/zabbix-daemon/files,proxy,\
-    $(zvariant))))
+$(foreach zvariant,nossl openssl gnutls,$(eval $(call Package/zabbix-daemon/files,agentd,$(zvariant),,$(call Package/zabbix-agentd/install-extra))))
+$(foreach zvariant,nossl openssl gnutls,$(eval $(call Package/zabbix-daemon/files,server,$(zvariant),$(call Package/zabbix-server/conffiles-extra),$(call Package/zabbix-server/install-extra))))
+$(foreach zvariant,nossl openssl gnutls,$(eval $(call Package/zabbix-daemon/files,proxy,$(zvariant))))
 
 # Due to nested defines, eval, and call, the extra spaces for the nested define
 # is essential.
@@ -475,9 +465,7 @@ define Package/zabbix-server/postinst/Default
          endef
 endef
 
-$(foreach zvariant,nossl openssl gnutls,\
-  $(eval $(call Package/zabbix-server/postinst/Default,\
-    $(zvariant))))
+$(foreach zvariant,nossl openssl gnutls,$(eval $(call Package/zabbix-server/postinst/Default,$(zvariant))))
 
 define Package/zabbix-program/files
         define Package/zabbix-$(1)-$(2)/install
@@ -485,12 +473,8 @@ define Package/zabbix-program/files
         endef
 endef
 
-$(foreach zvariant,nossl openssl gnutls,\
-  $(eval $(call Package/zabbix-program/files,sender,\
-    $(zvariant))))
-$(foreach zvariant,nossl openssl gnutls,\
-  $(eval $(call Package/zabbix-program/files,get,\
-    $(zvariant))))
+$(foreach zvariant,nossl openssl gnutls,$(eval $(call Package/zabbix-program/files,sender,$(zvariant))))
+$(foreach zvariant,nossl openssl gnutls,$(eval $(call Package/zabbix-program/files,get,$(zvariant))))
 
 define Package/zabbix-extra-mac80211/install
        $(call Package/zabbix/install/zabbix.conf.d,$(1),mac80211)