textclient: makefile no longer leaves behind test compiles

diff --git a/textclient/.gitignore b/textclient/.gitignore
index dc9a5743ab3170781098cb31d3f22afda1a499f4..d20b8f05272002eb6cc646ac632e2d23fc098de1 100644 (file)
--- 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 (file)
index de21005..0000000
--- 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 6460d59f322837dfbff84ca54e06f0906e97cda7..eba03f83dafb4a5db738a8e1e3a59cdcba4e3545 100755 (executable)
--- 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
 
 
 ########################################################################