X-Git-Url: http://git.indexdata.com/?p=mp-xquery-moved-to-github.git;a=blobdiff_plain;f=src%2FMakefile;h=e1b12aaaf68d6541140e012708d98659b22c7d98;hp=e432224b6bc06ec5a376e25a84368441eded917c;hb=612c1397bb46f1c03e45cc7be1822e9bd24bf5a2;hpb=ddacfd0150fdbd22ac3d49ab39ae681f91f70dec

diff --git a/src/Makefile b/src/Makefile
index e432224..e1b12aa 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -16,10 +16,10 @@ 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 -Wl,$(ZORBA)/lib -shared $(CXXFLAGS) $(LDFLAGS) $^ -o $@ $(MP_LIBS) $(ZORBA_LIBS)
+	$(CXX) -Wl,-rpath,$(ZORBA)/lib -shared $(CXXFLAGS) $(LDFLAGS) $^ -o $@ $(MP_LIBS) $(ZORBA_LIBS)
 
 install: $(MP_SO)
 	mkdir -p $(DESTDIR)$(libdir)/mp-xquery
@@ -29,7 +29,7 @@ clean:
 	rm -f *.o tst $(MP_SO)
 
 run_tst: tst
-	LD_LIBRARY_PATH=$(ZORBA)/lib ./tst
+	./tst
 
 run_mp:
-	LD_LIBRARY_PATH=$(ZORBA)/lib ../../metaproxy/src/metaproxy -c config.xml -X
+	../../metaproxy/src/metaproxy -c config.xml -X