Fix Makefile and dovecot configuration errors.

[postfix.git] / Makefile

diff --git a/Makefile b/Makefile
index 840494bb68ddb310aadcb5a550b97a6ce90d5065..3e55dfab5a170c47ac0be9dccf3a5f716b0821a1 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,24 @@
-SRC := $(shell pwd)
 DST := /etc/postfix
 
-INPUTS := main.cf  Makefile  master.cf  mysql/*  postgrey_whitelist_clients.local  postgrey_whitelist_recipients rbl_override
+INPUTS := \
+       configuration/main.cf \
+       configuration/master.cf \
+       configuration/postgrey_whitelist_clients.local \
+       configuration/postgrey_whitelist_recipients \
+       configuration/rbl_override \
+       configuration/mysql/relay_domains.cf \
+       configuration/mysql/virtual_alias_maps.cf \
+       configuration/mysql/virtual_domains_maps.cf \
+       configuration/mysql/virtual_mailbox_limits.cf \
+       configuration/mysql/virtual_mailbox_maps.cf
 
-all: $(INPUTS:%=$(DST)/%)
+OUTPUTS := $(subst configuration/,$(DST)/,$(INPUTS))
 
-$(DST)/%: $(SRC)/%
+all: $(OUTPUTS) postfixadmin
+
+postfixadmin:
+       ./setup-postfix.sh
+
+$(DST)/%: configuration/%
        @mkdir -p $(@D)
        cp $^ $@