From: Art Cancro <ajc@citadel.org>
Date: Wed, 27 Sep 2023 03:49:53 +0000 (-0400)
Subject: textclient: makefile no longer leaves behind test compiles
X-Git-Tag: v995~2
X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=094e8956ad967784a04d119cf47093cfa9485b17

textclient: makefile no longer leaves behind test compiles
---

diff --git a/textclient/.gitignore b/textclient/.gitignore
index dc9a5743a..d20b8f052 100644
--- a/textclient/.gitignore
+++ b/textclient/.gitignore
@@ -44,3 +44,4 @@ keys
 netconfigs
 data
 package-version.txt
+config.mk
diff --git a/textclient/config.mk b/textclient/config.mk
deleted file mode 100644
index de21005a5..000000000
--- a/textclient/config.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-CFLAGS := -g -I/usr/local/include -DHAVE_OPENSSL
-LDFLAGS := -L/usr/local/lib -lssl -lcrypto -lz
-PREFIX := /root/citadel/textclient
-BINDIR := /root/citadel/textclient/bin
-CTDLDIR := /root/citadel/citadel
diff --git a/textclient/configure b/textclient/configure
index 6460d59f3..eba03f83d 100755
--- a/textclient/configure
+++ b/textclient/configure
@@ -119,9 +119,13 @@ cc $tempcc -o $tempfile && {
 		LDFLAGS=${LDFLAGS}' -liconv'
 	} || {
 		echo Citadel Server requires iconv character set conversion.
+		rm -f $tempfile 2>/dev/null
+		rm -f $tempcc 2>/dev/null
 		exit 1
 	}
 }
+rm -f $tempfile 2>/dev/null
+rm -f $tempcc 2>/dev/null
 
 
 ########################################################################