X-Git-Url: https://git.distorted.org.uk/~mdw/exim-config/blobdiff_plain/4fd7858a386ea98d6cc28d810ebfc32c43a2cb57..5a72d0f31f02b3bac0725604a178e50713a1cbaf:/Makefile

diff --git a/Makefile b/Makefile
index 9ccbeee..46aa594 100644
--- a/Makefile
+++ b/Makefile
@@ -60,12 +60,12 @@ 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
 OPTIONS_hub		 = auth.m4 exchange.m4 local.m4 spam.m4
-OPTIONS_hub		+= user-spam.m4 vhost.m4
+OPTIONS_hub		+= user-spam.m4 vhost.m4 vhost-local.m4
 
 MODES			+= usersat
 OPTIONS_usersat		 = auth.m4 local.m4 satellite.m4
@@ -81,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)