Merge pull request #34 from mtremer/better-authentication

[people/ms/dma.git] / Makefile

diff --git a/Makefile b/Makefile
index a480e9340bfa3280ed49c8df8c2b11eef2378eef..aed2ef7246cf834231a2fa517fa2b1063c002ea0 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -8,14 +8,16 @@
 #   getprogname
 #
 
-version=       $(shell sh get-version.sh)
-debversion=    $(shell sh get-version.sh | sed -Ee 's/^v//;s/[.]([[:digit:]]+)[.](g[[:xdigit:]]+)$$/+\1+\2/')
+SH?=           sh
+
+version=       $(shell ${SH} get-version.sh)
+debversion=    $(shell ${SH} get-version.sh | sed -Ee 's/^v//;s/[.]([[:digit:]]+)[.](g[[:xdigit:]]+)$$/+\1+\2/')
 
 CC?=           gcc
 CFLAGS?=       -O -pipe
 LDADD?=                -lssl -lcrypto -lresolv
 
-CFLAGS+=       -Wall -DDMA_VERSION='"${version}"' -DLIBEXEC_PATH='"${LIBEXEC}"'
+CFLAGS+=       -Wall -DDMA_VERSION='"${version}"' -DLIBEXEC_PATH='"${LIBEXEC}"' -DCONF_PATH='"${CONFDIR}"'
 
 INSTALL?=      install -p
 CHGRP?=                chgrp
@@ -24,7 +26,7 @@ CHMOD?=               chmod
 PREFIX?=       /usr/local
 SBIN?=         ${PREFIX}/sbin
 LIBEXEC?=      ${PREFIX}/lib
-CONFDIR?=      /etc
+CONFDIR?=      /etc/dma
 MAN?=          ${PREFIX}/share/man
 VAR?=          /var
 DMASPOOL?=     ${VAR}/spool/dma
@@ -46,7 +48,7 @@ clean:
        -rm -f aliases_parse.[ch] aliases_scan.c
 
 install: all
-       ${INSTALL} -d ${DESTDIR}${SBIN} ${DESTDIR}${CONFDIR}
+       ${INSTALL} -d ${DESTDIR}${SBIN}
        ${INSTALL} -d ${DESTDIR}${MAN}/man8 ${DESTDIR}${LIBEXEC}
        ${INSTALL} -m 2755 -o root -g mail dma ${DESTDIR}${SBIN}
        ${INSTALL} -m 4754 -o root -g mail dma-mbox-create ${DESTDIR}${LIBEXEC}
@@ -65,6 +67,22 @@ install-spool-dirs:
 permissions:
        -${CHGRP} mail ${DESTDIR}${VARMAIL}/*
        -${CHMOD} g+w ${DESTDIR}${VARMAIL}/*
+       -${CHMOD} 660 ${DESTDIR}${DMASPOOL}/flush
+
+install-etc:
+       ${INSTALL} -d ${DESTDIR}${CONFDIR}
+       @if [ -e ${DESTDIR}${CONFDIR}/dma.conf ]; then \
+               echo "Not overwriting ${DESTDIR}${CONFDIR}/dma.conf."; \
+       else \
+               echo ${INSTALL} -m 644 -o root -g mail dma.conf ${DESTDIR}${CONFDIR}; \
+               ${INSTALL} -m 644 -o root -g mail dma.conf ${DESTDIR}${CONFDIR}; \
+       fi
+       @if [ -e ${DESTDIR}${CONFDIR}/auth.conf ]; then \
+               echo "Not overwriting ${DESTDIR}${CONFDIR}/auth.conf."; \
+       else \
+               echo ${INSTALL} -m 640 -o root -g mail auth.conf ${DESTDIR}${CONFDIR}; \
+               ${INSTALL} -m 640 -o root -g mail auth.conf ${DESTDIR}${CONFDIR}; \
+       fi
 
 aliases_parse.c: aliases_parse.y
        ${YACC} -d -o aliases_parse.c aliases_parse.y