Merge branch 'master' into output

[pspp-builds.git] / src / ui / terminal / automake.mk

diff --git a/src/ui/terminal/automake.mk b/src/ui/terminal/automake.mk
index 598cdddd8eefaeea38196d188be9e33baeda36f0..81b896dc878839d44590f9e3205ebc53d5e07fb0 100644 (file)
--- a/src/ui/terminal/automake.mk
+++ b/src/ui/terminal/automake.mk
@@ -14,7 +14,7 @@ src_ui_terminal_libui_la_SOURCES = \
        src/ui/terminal/terminal-opts.h 
 
 
-src_ui_terminal_libui_la_CFLAGS = -DINSTALLDIR=\"$(bindir)\" $(NCURSES_CFLAGS)
+src_ui_terminal_libui_la_CFLAGS = $(NCURSES_CFLAGS)
 
 bin_PROGRAMS += src/ui/terminal/pspp
 
@@ -25,12 +25,13 @@ src_ui_terminal_pspp_LDADD = \
        src/ui/libuicommon.la \
        src/libpspp.la \
        src/libpspp-core.la \
+       $(CAIRO_LIBS) \
        $(NCURSES_LIBS) \
        $(LIBICONV) \
-       @LIBINTL@ @LIBREADLINE@
+       $(LIBINTL) $(LIBREADLINE)
 
 
-src_ui_terminal_pspp_LDFLAGS = $(PG_LDFLAGS)
+src_ui_terminal_pspp_LDFLAGS = $(PSPP_LDFLAGS) $(PG_LDFLAGS)
 
 if RELOCATABLE_VIA_LD
 src_ui_terminal_pspp_LDFLAGS += `$(RELOCATABLE_LDFLAGS) $(bindir)`