From 7c43ea06b0694c3a1f50cb1ef17f48271f28b8ce Mon Sep 17 00:00:00 2001
From: Mark Wooding <mdw@distorted.org.uk>
Date: Fri, 18 Mar 2016 09:38:59 +0000
Subject: [PATCH] Makefile: Set config options from mode-specific make
 variables.

Use this to set `sysdomains' for the `srv' mode; now we don't need
`nosysdomains.m4' any more.
---
 Makefile       | 4 ++--
 nosysdomain.m4 | 5 -----
 2 files changed, 2 insertions(+), 7 deletions(-)
 delete mode 100644 nosysdomain.m4

diff --git a/Makefile b/Makefile
index 844b31a..49a1179 100644
--- a/Makefile
+++ b/Makefile
@@ -60,7 +60,7 @@ MODES			+= satellite
 OPTIONS_satellite	 = satellite.m4 sat-rewrite.m4
 
 MODES			+= srv
-HOOKS_srv		 = nosysdomain.m4
+CONF_srv		 = sysdomains=
 OPTIONS_srv		 = exchange.m4 spam.m4 vhost.m4 sat-rewrite.m4
 
 MODES			+= hub
@@ -81,7 +81,7 @@ HOST_MODES		+= $(foreach m, $(MODES), \
 CONFIGS			 = $(foreach m, $(MODES), exim4-$m.conf)
 TARGETS			+= $(CONFIGS)
 $(CONFIGS): exim4-%.conf: $(EARLY) $$(HOOKS_$$*) $(MAIN) $$(OPTIONS_$$*)
-	$(V_GEN)m4 -P -DMODE=$* $^ >$@.new
+	$(V_GEN)m4 -P -DMODE=$* $(CONF_$*:%=-DCONF_%) $^ >$@.new
 	$(V_AT)$(CHECK_$*)exim4 -C$$(pwd)/$@.new -bV >/dev/null
 	$(V_AT)mv $@.new $@
 
diff --git a/nosysdomain.m4 b/nosysdomain.m4
deleted file mode 100644
index c1e257d..0000000
--- a/nosysdomain.m4
+++ /dev/null
@@ -1,5 +0,0 @@
-### -*-m4-*-
-###
-### Don't provide service for the system domain.
-
-SETCONF(sysdomains, )
-- 
2.11.0