summaryrefslogtreecommitdiffstats
path: root/liblangtag
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2012-09-20 15:00:50 +0200
committerStephan Bergmann <sbergman@redhat.com>2012-09-20 15:46:10 +0200
commit179a6db61ee30cf776747802f06edeef45fec461 (patch)
treead0523924ffad7b1579c96d95b772efdd0ec5b96 /liblangtag
parentAdd some static goodness here, too, to avoid duplicate symbols (diff)
downloadcore-179a6db61ee30cf776747802f06edeef45fec461.tar.gz
core-179a6db61ee30cf776747802f06edeef45fec461.zip
Add RPATH to liblangtag
...so that it consistenly uses the LO versions of libxml2/glibc libs at runtime. Change-Id: I89b7fd13a8b5b7e697ec21db74fdf8ef088fdb92
Diffstat (limited to 'liblangtag')
-rw-r--r--liblangtag/makefile.mk8
1 files changed, 8 insertions, 0 deletions
diff --git a/liblangtag/makefile.mk b/liblangtag/makefile.mk
index ae6f58eba941..39ca09910216 100644
--- a/liblangtag/makefile.mk
+++ b/liblangtag/makefile.mk
@@ -101,6 +101,14 @@ CONFIGURE_ACTION=$(AUGMENT_LIBRARY_PATH) ./configure
BUILD_ACTION=$(AUGMENT_LIBRARY_PATH) $(GNUMAKE) && \
$(AUGMENT_LIBRARY_PATH) $(GNUMAKE) install DESTDIR=$(my_destdir)
+.IF "$(SYSTEM_LIBXML)"!="YES" || "$(SYSTEM_GLIB)"!="YES"
+.IF "$(OS)"=="FREEBSD" || "$(OS)"=="LINUX"
+CONFIGURE_FLAGS+= \
+ LDFLAGS=-Wl,-z,origin\ -Wl,-rpath,\'\$$\$$ORIGIN:\$$\$$ORIGIN/../ure-link/lib\'
+.ELIF "$(OS)"=="SOLARIS"
+CONFIGURE_FLAGS+= LDFLAGS=-Wl,-R\'\$$\$$ORIGIN:\$$\$$ORIGIN/../ure-link/lib\'
+.END
+.END
.IF "$(GUI)"=="WNT"
.IF "$(COM)"=="GCC"