X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2FMakefile;h=9bb07c648fb7949646f6767249d070061666c53a;hb=58909a312612d57e5a38fcf15f7ea24f4b49801d;hp=55b478e26501a8aa95eee91bac0603e7f4de5d66;hpb=a03208d6ee00a84725cf66675285067eb7a23897;p=mp-xquery-moved-to-github.git

diff --git a/src/Makefile b/src/Makefile
index 55b478e..9bb07c6 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,5 +1,7 @@
 ROOT=..
 ZORBA := $(ROOT)/../zorba/zorba-3.0/build/dist
+prefix=/usr
+libdir = ${prefix}/lib
 
 ifeq "${MP_CONFIG}" ""
 MP_CONFIG := $(shell if test -x $(ROOT)/../metaproxy/metaproxy-config; then echo $(ROOT)/../metaproxy/metaproxy-config; else echo metaproxy-config; fi)
@@ -16,10 +18,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 +31,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