X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=src%2Fui%2Fterminal%2Fautomake.mk;h=dfc52454eaad07a8513141361a5a4968186fa136;hb=610159421fde49f3f24622c60e193cf415086a64;hp=20821b494a5a9b727ef465abaa51edfb73c371ec;hpb=92a8c8fc46b9e4619f92b05e4375a09cda6c9247;p=pspp-builds.git

diff --git a/src/ui/terminal/automake.mk b/src/ui/terminal/automake.mk
index 20821b49..dfc52454 100644
--- a/src/ui/terminal/automake.mk
+++ b/src/ui/terminal/automake.mk
@@ -11,24 +11,32 @@ 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_LDADD = \
 	src/ui/terminal/libui.a \
-	src/ui/libuicommon.a \
 	src/language/liblanguage.a \
 	src/output/charts/libcharts.a \
 	src/output/liboutput.a \
 	src/math/libpspp_math.a  \
 	src/math/linreg/libpspp_linreg.a  \
+	src/ui/libuicommon.a \
 	lib/linreg/liblinreg.a	\
 	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