X-Git-Url: http://git.indexdata.com/?p=mp-xquery-moved-to-github.git;a=blobdiff_plain;f=src%2FMakefile;h=9bb07c648fb7949646f6767249d070061666c53a;hp=31d2ba1348d1f1eae64e592c30896583cceb6823;hb=700848d50e4704133fbc4099aa30afa28f6ebfbf;hpb=2f8add7d38665b398a719f1d485577db377be76b

diff --git a/src/Makefile b/src/Makefile
index 31d2ba1..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,13 +18,20 @@ 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) -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
+	cp $(MP_SO) $(DESTDIR)$(libdir)/mp-xquery
 
 clean:
 	rm -f *.o tst $(MP_SO)
 
-run: tst
-	LD_LIBRARY_PATH=$(ZORBA)/lib ./tst
+run_tst: tst
+	./tst
+
+run_mp:
+	../../metaproxy/src/metaproxy -c config.xml -X