diff --git a/src/Makefile.am b/src/Makefile.am
index 099f55e..bb7c04c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -41,10 +41,10 @@ trader_SOURCES	= \
 	utils.c		utils.h		\
 			system.h
 
-trader_CPPFLAGS	= -I$(top_builddir)/lib -I$(top_srcdir)/lib		\
-		  @CURSES_CFLAGS@ -DLOCALEDIR=\"$(localedir)\"
-trader_LDADD	= @CURSES_LIBS@ $(top_builddir)/lib/libgnu.a		\
-		  @LIB_HARD_LOCALE@ @LIB_MBRTOWC@ @LIB_SETLOCALE_NULL@	\
-		  @LIBICONV@ @LIBINTL@
+trader_CPPFLAGS	= -I$(top_builddir)/lib -I$(top_srcdir)/lib		  \
+		  $(CURSES_CFLAGS) -DLOCALEDIR=\"$(localedir)\"
+trader_LDADD	= $(CURSES_LIBS) $(top_builddir)/lib/libgnu.a		  \
+		  $(LIB_HARD_LOCALE) $(LIB_MBRTOWC) $(LIB_SETLOCALE_NULL) \
+		  $(LIBICONV) $(LIBINTL)
 
 EXTRA_DIST	= README