X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=Makefile;h=02627180c197ea17f233655eec3b43c0d4325b6e;hb=9f7c8589037edc84770736e579057cad34e0e464;hp=5e7d670c749e9c85f6772afef5ee55ccea0b5890;hpb=c1ebccb4122107d9c6a2b2c2cee0d72e359aa400;p=people%2Fms%2Fdma.git

diff --git a/Makefile b/Makefile
index 5e7d670..0262718 100644
--- 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,14 +26,16 @@ 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
 VARMAIL?=	${VAR}/mail
+SYMLINK?=	-s # or empty to create hard link
 
 YACC?=		yacc
 LEX?=		lex
+LN?=		ln
 
 OBJS=	aliases_parse.o aliases_scan.o base64.o conf.o crypto.o
 OBJS+=	dma.o dns.o local.o mail.o net.o spool.o util.o
@@ -42,13 +46,21 @@ all: dma dma-mbox-create
 clean:
 	-rm -f .depend dma dma-mbox-create *.[do]
 	-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}
 	${INSTALL} -m 0644 dma.8 ${DESTDIR}${MAN}/man8/
+
+sendmail-link:
+	cd ${DESTDIR}${SBIN} && ${LN} ${SYMLINK} dma sendmail
+
+mailq-link:
+	cd ${DESTDIR}${SBIN} && ${LN} ${SYMLINK} dma mailq
+
+install-spool-dirs:
 	${INSTALL} -d -m 2775 -o root -g mail ${DESTDIR}${DMASPOOL}
 	${INSTALL} -d -m 2775 -o root -g mail ${DESTDIR}${VARMAIL}
 
@@ -56,6 +68,21 @@ permissions:
 	-${CHGRP} mail ${DESTDIR}${VARMAIL}/*
 	-${CHMOD} g+w ${DESTDIR}${VARMAIL}/*
 
+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
 
@@ -68,7 +95,7 @@ aliases_scan.c: aliases_scan.l
 	${CC} ${CFLAGS} ${CPPFLAGS} -include dfcompat.h -o $@ -c $<
 
 dma: ${OBJS}
-	${CC} ${LDFLAGS} ${LDADD} -o $@ ${OBJS}
+	${CC} ${LDFLAGS} -o $@ ${OBJS} ${LDADD}
 
 
 dch:
@@ -77,7 +104,7 @@ dch:
 
 ppa:
 	@if [ -z '${DEB_DIST}' ]; then echo "please set DEB_DIST to build"; exit 1; fi
-	dch -v "${debversion}~${DEB_DIST}" -D ${DEB_DIST} "${DEB_DIST} build"
+	dch -v "${debversion}~${DEB_DIST}" -D ${DEB_DIST} "${DEB_DIST} build" -b
 	debuild -S -sa
 	ver=$$(dpkg-parsechangelog -n1 | awk '$$1 == "Version:" { print $$2 }'); \
-	dput ppa:corecode/dma ../$${ver}_source.changes
+	dput ppa:corecode/dma ../dma_$${ver}_source.changes