From: Adam Dickmeiss <adam@indexdata.dk>
Date: Wed, 18 Jun 2014 09:01:20 +0000 (+0200)
Subject: Pass rpath to tst program too
X-Git-Tag: v0.2~6
X-Git-Url: http://sru.miketaylor.org.uk/cgi-bin?a=commitdiff_plain;h=1699ede93aee42c8a0944de672ab8c4f88a634f3;p=mp-xquery-moved-to-github.git

Pass rpath to tst program too
---

diff --git a/src/Makefile b/src/Makefile
index 73bd1c7..e1b12aa 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -16,7 +16,7 @@ CXXFLAGS := $(ZORBA_CFLAGS) $(MP_CFLAGS) -fPIC
 all: tst $(MP_SO)
 
 tst: tst.o
-	$(CXX) $^ -o $@ $(ZORBA_LIBS)
+	$(CXX) -Wl,-rpath,$(ZORBA)/lib $^ -o $@ $(ZORBA_LIBS)
 
 $(MP_SO): metaproxy_filter_xquery.o
 	$(CXX) -Wl,-rpath,$(ZORBA)/lib -shared $(CXXFLAGS) $(LDFLAGS) $^ -o $@ $(MP_LIBS) $(ZORBA_LIBS)
@@ -29,7 +29,7 @@ clean:
 	rm -f *.o tst $(MP_SO)
 
 run_tst: tst
-	LD_LIBRARY_PATH=$(ZORBA)/lib ./tst
+	./tst
 
 run_mp:
 	../../metaproxy/src/metaproxy -c config.xml -X