summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTodd T. Fries <todd@cvs.openbsd.org>2008-12-04 13:36:59 +0000
committerTodd T. Fries <todd@cvs.openbsd.org>2008-12-04 13:36:59 +0000
commit736ed25b35940a24e2a93311b08b3ce6f077092d (patch)
tree1e5b0fe8a64712d7312f9ff26c7a581e5418f5d1
parentde8980073d18b2272473a8634ddb19f743af63f9 (diff)
move smtpd build to smtpd subdir so we can traverse to newaliases and makemap
ok gilles@
-rw-r--r--usr.sbin/smtpd/Makefile26
-rw-r--r--usr.sbin/smtpd/smtpd/Makefile24
2 files changed, 32 insertions, 18 deletions
diff --git a/usr.sbin/smtpd/Makefile b/usr.sbin/smtpd/Makefile
index 19fe2fe9e4e..5b84c48eb00 100644
--- a/usr.sbin/smtpd/Makefile
+++ b/usr.sbin/smtpd/Makefile
@@ -1,21 +1,11 @@
-# $OpenBSD: Makefile,v 1.4 2008/12/03 20:11:35 gilles Exp $
+# $OpenBSD: Makefile,v 1.5 2008/12/04 13:36:58 todd Exp $
-PROG= smtpd
-SRCS= parse.y log.c config.c buffer.c imsg.c \
- smtpd.c lka.c mfa.c queue.c mta.c mda.c control.c \
- smtp.c smtp_session.c store.c \
- ssl.c ssl_privsep.c dns.c aliases.c forward.c \
- map.c
-MAN= smtpd.8 smtpd.conf.5
+.include <bsd.own.mk>
-LDADD= -levent -lutil -lssl -lcrypto
-DPADD= ${LIBEVENT} ${LIBSSL} ${LIBCRYPTO}
-CFLAGS= -g3 -ggdb -I${.CURDIR}
-CFLAGS+= -Wall -Wstrict-prototypes -Wmissing-prototypes
-CFLAGS+= -Wmissing-declarations
-CFLAGS+= -Wshadow -Wpointer-arith -Wcast-qual
-CFLAGS+= -Wsign-compare -Wbounded
-#CFLAGS+= -Werror # during development phase (breaks some archs)
-YFLAGS=
+SUBDIRS = makemap newaliases smtpd
-.include <bsd.prog.mk>
+distribution:
+ ${INSTALL} -C -o root -g wheel -m 0644 ${.CURDIR}/smtpd.conf \
+ ${DESTDIR}/etc/mail/smtpd.conf
+
+.include <bsd.subdir.mk>
diff --git a/usr.sbin/smtpd/smtpd/Makefile b/usr.sbin/smtpd/smtpd/Makefile
new file mode 100644
index 00000000000..78247187961
--- /dev/null
+++ b/usr.sbin/smtpd/smtpd/Makefile
@@ -0,0 +1,24 @@
+# $OpenBSD: Makefile,v 1.1 2008/12/04 13:36:58 todd Exp $
+
+PROG= smtpd
+SRCS= parse.y log.c config.c buffer.c imsg.c \
+ smtpd.c lka.c mfa.c queue.c mta.c mda.c control.c \
+ smtp.c smtp_session.c store.c \
+ ssl.c ssl_privsep.c dns.c aliases.c forward.c \
+ map.c
+MAN= smtpd.8 smtpd.conf.5
+BINDIR= /usr/sbin
+
+LDADD= -levent -lutil -lssl -lcrypto
+DPADD= ${LIBEVENT} ${LIBSSL} ${LIBCRYPTO}
+CFLAGS= -g3 -ggdb -I${.CURDIR}/..
+CFLAGS+= -Wall -Wstrict-prototypes -Wmissing-prototypes
+CFLAGS+= -Wmissing-declarations
+CFLAGS+= -Wshadow -Wpointer-arith -Wcast-qual
+CFLAGS+= -Wsign-compare -Wbounded
+#CFLAGS+= -Werror # during development phase (breaks some archs)
+YFLAGS=
+
+.PATH: ${.CURDIR}/..
+
+.include <bsd.prog.mk>