projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Made the code relocatable (using the relocate function from gnulib).
[pspp-builds.git]
/
src
/
ui
/
gui
/
automake.mk
diff --git
a/src/ui/gui/automake.mk
b/src/ui/gui/automake.mk
index 6f6fa3c52c7ea2e5e67339bcd4d816803165f442..3777672a2def0a8704e549b80e575e84064802a1 100644
(file)
--- a/
src/ui/gui/automake.mk
+++ b/
src/ui/gui/automake.mk
@@
-4,12
+4,20
@@
bin_PROGRAMS += src/ui/gui/psppire
bin_PROGRAMS += src/ui/gui/psppire
+src_ui_gui_psppire_CFLAGS = $(GTK_CFLAGS) $(GLADE_CFLAGS) -Wall \
+ -DINSTALLDIR=\"$(bindir)\"
-src_ui_gui_psppire_CFLAGS = $(GTK_CFLAGS) $(GLADE_CFLAGS) -Wall
src_ui_gui_psppire_LDFLAGS = \
src_ui_gui_psppire_LDFLAGS = \
- -export-dynamic \
- -rpath $(pkglibdir)
+ -export-dynamic
+
+
+if RELOCATABLE_VIA_LD
+src_ui_gui_psppire_LDFLAGS += `$(RELOCATABLE_LDFLAGS) $(bindir)`
+else
+src_ui_gui_psppire_LDFLAGS += -rpath $(pkglibdir)
+endif
+
pkglib_LTLIBRARIES = src/ui/gui/libpsppire.la
pkglib_LTLIBRARIES = src/ui/gui/libpsppire.la
@@
-106,3
+114,4
@@
src_ui_gui_psppire_SOURCES = \
src/ui/gui/window-manager.c \
src/ui/gui/window-manager.h
src/ui/gui/window-manager.c \
src/ui/gui/window-manager.h
+