Index: Makefile.in
==================================================================
--- Makefile.in
+++ Makefile.in
@@ -1,10 +1,12 @@
 CC = @PTHREAD_CC@
-CFLAGS = @CFLAGS@ @PTHREAD_CFLAGS@
+RELCFLAGS = @CFLAGS@ @PTHREAD_CFLAGS@
 DEBUGCFLAGS = @CFLAGS@ @PTHREAD_CFLAGS@ -DCACKEY_DEBUG=1
-CPPFLAGS = @CPPFLAGS@ @DEFS@ -I./pkcs11/
+RELCPPFLAGS = @CPPFLAGS@ @DEFS@ -I./pkcs11/
 DEBUGCPPFLAGS = @CPPFLAGS@ -DCACKEY_DEBUG=1 -I./pkcs11/ @DEFS@
+CFLAGS = $(DEBUGCFLAGS)
+CPPFLAGS = $(DEBUGCPPFLAGS)
 LDFLAGS = @LDFLAGS@
 LIBS = @LIBS@ @PTHREAD_LIBS@
 SHOBJFLAGS = @SHOBJFLAGS@
 SHOBJLDFLAGS = @SHOBJLDFLAGS@
 AR = @AR@