aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGilles Chehade <gilles@poolp.org>2020-05-22 14:43:45 +0200
committerGilles Chehade <gilles@poolp.org>2020-05-22 14:43:45 +0200
commita6a39cb0cb6ee72d194f84d6763997df7e0c0bf3 (patch)
tree7a8050aa5238ed9b9d77298e4709f8017541e5b3
parentmove smtpd to usr.sbin to ease upstream cherry-picking (diff)
downloadOpenSMTPD-a6a39cb0cb6ee72d194f84d6763997df7e0c0bf3.tar.xz
OpenSMTPD-a6a39cb0cb6ee72d194f84d6763997df7e0c0bf3.zip
fix build
-rw-r--r--contrib/libexec/encrypt/Makefile.am2
-rw-r--r--contrib/libexec/lockspool/Makefile.am2
-rw-r--r--contrib/libexec/mail.local/Makefile.am2
-rw-r--r--mk/pathnames2
-rw-r--r--openbsd-compat/Makefile.am2
5 files changed, 5 insertions, 5 deletions
diff --git a/contrib/libexec/encrypt/Makefile.am b/contrib/libexec/encrypt/Makefile.am
index 6ad7b82d..2f96e60d 100644
--- a/contrib/libexec/encrypt/Makefile.am
+++ b/contrib/libexec/encrypt/Makefile.am
@@ -1,7 +1,7 @@
pkglibexec_PROGRAMS = encrypt
encrypt_SOURCES = encrypt.c
-encrypt_SOURCES += $(top_srcdir)/smtpd/log.c
+encrypt_SOURCES += $(top_srcdir)/usr.sbin/smtpd/log.c
AM_CPPFLAGS = -I$(top_srcdir)/openbsd-compat
diff --git a/contrib/libexec/lockspool/Makefile.am b/contrib/libexec/lockspool/Makefile.am
index dacf5386..2801c101 100644
--- a/contrib/libexec/lockspool/Makefile.am
+++ b/contrib/libexec/lockspool/Makefile.am
@@ -2,7 +2,7 @@ pkglibexec_PROGRAMS = lockspool
lockspool_SOURCES = lockspool.c
lockspool_SOURCES += locking.c
-lockspool_SOURCES += $(top_srcdir)/smtpd/log.c
+lockspool_SOURCES += $(top_srcdir)/usr.sbin/smtpd/log.c
EXTRA_DIST = mail.local.h pathnames.h
diff --git a/contrib/libexec/mail.local/Makefile.am b/contrib/libexec/mail.local/Makefile.am
index bd5211a2..217659c1 100644
--- a/contrib/libexec/mail.local/Makefile.am
+++ b/contrib/libexec/mail.local/Makefile.am
@@ -2,7 +2,7 @@ pkglibexec_PROGRAMS = mail.local
mail_local_SOURCES = mail.local.c
mail_local_SOURCES += locking.c
-mail_local_SOURCES += $(top_srcdir)/smtpd/log.c
+mail_local_SOURCES += $(top_srcdir)/usr.sbin/smtpd/log.c
EXTRA_DIST = mail.local.h pathnames.h
diff --git a/mk/pathnames b/mk/pathnames
index b233ec33..5cff32da 100644
--- a/mk/pathnames
+++ b/mk/pathnames
@@ -1,4 +1,4 @@
-smtpd_srcdir = $(top_srcdir)/smtpd
+smtpd_srcdir = $(top_srcdir)/usr.sbin/smtpd
compat_srcdir = $(top_srcdir)/openbsd-compat
regress_srcdir = $(top_srcdir)/regress/bin
diff --git a/openbsd-compat/Makefile.am b/openbsd-compat/Makefile.am
index 01a3efe7..0e704cfd 100644
--- a/openbsd-compat/Makefile.am
+++ b/openbsd-compat/Makefile.am
@@ -1,6 +1,6 @@
noinst_LIBRARIES = libopenbsd.a
-AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/smtpd -I$(top_srcdir)/openbsd-compat
+AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/usr.sbin/smtpd -I$(top_srcdir)/openbsd-compat
libopenbsd_a_SOURCES = empty.c