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

diff --git a/src/Makefile b/src/Makefile
index f6f5061..e1b12aa 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -16,16 +16,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: 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