Made the code relocatable (using the relocate function from gnulib).

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

diff --git a/src/ui/terminal/automake.mk b/src/ui/terminal/automake.mk
index ef56b7e97f65c005be03065a11eeb74bd8e87583..fd426acd02dabad257deb4538c1cdbb9132317e7 100644 (file)
--- a/src/ui/terminal/automake.mk
+++ b/src/ui/terminal/automake.mk
@@ -11,12 +11,14 @@ src_ui_terminal_libui_a_SOURCES = \
        src/ui/terminal/msg-ui.c \
        src/ui/terminal/msg-ui.h
 
+src_ui_terminal_libui_a_CFLAGS = -DINSTALLDIR=\"$(bindir)\"
 
 bin_PROGRAMS += src/ui/terminal/pspp
 
+
 src_ui_terminal_pspp_SOURCES =
 
-src_ui_terminal_pspp_LDADD =                                   \
+src_ui_terminal_pspp_LDFLAGS = \
        src/ui/terminal/libui.a \
        src/language/liblanguage.a \
        src/output/charts/libcharts.a \
@@ -28,7 +30,13 @@ src_ui_terminal_pspp_LDADD =                                 \
        lib/gsl-extras/libgsl-extras.a  \
        src/data/libdata.a \
        src/libpspp/libpspp.a \
-       gl/libgl.a      \
        $(LIBICONV) \
+       gl/libgl.la \
        @LIBINTL@ @LIBREADLINE@
 
+
+
+
+if RELOCATABLE_VIA_LD
+src_ui_terminal_pspp_LDFLAGS += `$(RELOCATABLE_LDFLAGS) $(bindir)`
+endif