X-Git-Url: https://git.distorted.org.uk/~mdw/exim-config/blobdiff_plain/1c921c9f5597e1ae31acf225d7cbca2f97e5051c..2f2fc64da4fd3e3edb06589a5e7dd0f3e958a40b:/Makefile

diff --git a/Makefile b/Makefile
index 341208e..46aa594 100644
--- a/Makefile
+++ b/Makefile
@@ -57,10 +57,15 @@ MAIN			 = lists.m4 base.m4
 MODES			 =
 
 MODES			+= satellite
-OPTIONS_satellite	 = satellite.m4
+OPTIONS_satellite	 = satellite.m4 sat-rewrite.m4
+
+MODES			+= srv
+CONF_srv		 = sysdomains=
+OPTIONS_srv		 = exchange.m4 spam.m4 vhost.m4 sat-rewrite.m4
 
 MODES			+= hub
-OPTIONS_hub		 = auth.m4 exchange.m4 local.m4 spam.m4 vhost.m4
+OPTIONS_hub		 = auth.m4 exchange.m4 local.m4 spam.m4
+OPTIONS_hub		+= user-spam.m4 vhost.m4 vhost-local.m4
 
 MODES			+= usersat
 OPTIONS_usersat		 = auth.m4 local.m4 satellite.m4
@@ -76,8 +81,8 @@ 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_AT)$(CHECK_$*)exim4 -C$@.new -bV >/dev/null
+	$(V_GEN)m4 -P -DMODE=$* $(CONF_$*:%=-DCONF_%) $^ >$@.new
+	$(V_AT)$(CHECK_$*)exim4 -C$$(pwd)/$@.new -bV >/dev/null
 	$(V_AT)mv $@.new $@
 
 all: $(TARGETS)