Index: csup/GNUmakefile
===================================================================
--- csup.orig/GNUmakefile
+++ csup/GNUmakefile
@@ -21,7 +21,7 @@ WARNS=	-Wall -W -Wno-unused-parameter -W
 	-Wcast-align -Wunused-parameter -Wchar-subscripts -Winline \
 	-Wnested-externs -Wredundant-decls -Wno-format-y2k
 
-CFLAGS+= -g -O -pipe -DNDEBUG -I$(PREFIX)/include
+CFLAGS+= -I$(PREFIX)/include
 ifeq ($(UNAME), Linux)
 	CFLAGS+= -D_XOPEN_SOURCE -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64
 endif
@@ -29,14 +29,14 @@ ifeq ($(UNAME), Darwin)
 	CFLAGS+= -DHAVE_FFLAGS
 endif
 CFLAGS+= $(WARNS)
-LDFLAGS= -L$(PREFIX)/lib -lcrypto -lz -lpthread
+LIBS= -L$(PREFIX)/lib -lcrypto -lz -lpthread
 
 .PHONY: all clean install
 
 all: csup csup.1.gz
 
 csup: $(OBJS)
-	$(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS)
+	$(CC) $(LDFLAGS) $(CFLAGS) -o $@ $^ $(LIBS)
 
 config.c: parse.h
 
Index: csup/Makefile
===================================================================
--- csup.orig/Makefile
+++ csup/Makefile
@@ -11,7 +11,7 @@ SRCS=	attrstack.c config.c detailer.c di
 	globtree.c idcache.c keyword.c lister.c main.c misc.c mux.c parse.y \
 	pathcomp.c proto.c status.c stream.c threads.c token.l updater.c
 
-CFLAGS+=	-I. -I${.CURDIR} -g -pthread -DHAVE_FFLAGS -DNDEBUG
+CFLAGS+=	-I. -I${.CURDIR} -pthread -DHAVE_FFLAGS
 WARNS?=		6
 
 # A bit of tweaking is needed to get this Makefile working