From 90fefa7f1940c990d4047d5403edff6a6688c74b Mon Sep 17 00:00:00 2001
From: Art Cancro <ajc@citadel.org>
Date: Sun, 5 Jun 2022 13:05:38 -0400
Subject: [PATCH] Converted citmail to the new setup:

---
 citadel/Makefile        | 5 ++++-
 citadel/utils/citmail.c | 8 ++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/citadel/Makefile b/citadel/Makefile
index fa46fa7ea..d6b2ba705 100644
--- a/citadel/Makefile
+++ b/citadel/Makefile
@@ -17,7 +17,7 @@
 # config.mk is generated by ./configure
 include config.mk
 
-all: citserver setup ctdlmigrate sendcommand
+all: citserver setup ctdlmigrate sendcommand citmail
 
 citserver: server/*.c server/modules/*/*.c config.mk server/*.h
 	cc ${CFLAGS} \
@@ -34,6 +34,9 @@ ctdlmigrate: utils/ctdlmigrate.c server/citadel_dirs.c utils/*.h server/*.h
 sendcommand: utils/sendcommand.c server/citadel_dirs.c utils/*.h server/*.h
 	cc ${CFLAGS} utils/sendcommand.c -lcitadel -o sendcommand
 
+citmail: utils/citmail.c server/citadel_dirs.c utils/*.h server/*.h
+	cc ${CFLAGS} utils/citmail.c -lcitadel -o citmail
+
 config.mk: configure
 	./configure
 
diff --git a/citadel/utils/citmail.c b/citadel/utils/citmail.c
index 924b67571..aef2589dd 100644
--- a/citadel/utils/citmail.c
+++ b/citadel/utils/citmail.c
@@ -1,4 +1,4 @@
-// This program attempts to act like a local MDA if you're using sendmail or
+// This program attempts to act like a local MDA if you're using postfix or
 // some other non-Citadel MTA.  It basically just contacts the Citadel LMTP
 // listener on a unix domain socket and transmits the message.  Really though,
 // if your MTA supports LMTP then you definitely should be using that instead.
@@ -9,7 +9,6 @@
 // is subject to the terms of the GNU General Public License, version 3.
 // The program is distributed without any warranty, expressed or implied.
 
-#include "sysdep.h"
 #include <stdlib.h>
 #include <unistd.h>
 #include <ctype.h>
@@ -25,8 +24,9 @@
 #include <stdarg.h>
 #include <limits.h>
 #include <libcitadel.h>
-#include "citadel.h"
-#include "citadel_dirs.h"
+#include "../server/sysdep.h"
+#include "../server/citadel.h"
+#include "../server/citadel_dirs.h"
 
 int serv_sock;
 int debug = 0;
-- 
2.39.2