X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2FMakefile;h=dca54749619616acee9af72ce8584b5f3834fb76;hb=6b5aa21237fe92092d4add78dff041f33c995d19;hp=65065a1f3cf1d0e72b8e6d7b1688ea2980afd648;hpb=18cfda880d402e1df077f8e4521ede2546fde2ca;p=mp-xquery-moved-to-github.git

diff --git a/src/Makefile b/src/Makefile
index 65065a1..dca5474 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,5 +1,8 @@
 ROOT=..
 ZORBA := $(ROOT)/../zorba/zorba-3.0/build/dist
+prefix=/usr
+libdir = ${prefix}/lib
+VERSION := $(shell . $(ROOT)/IDMETA; echo $$VERSION)
 
 ifeq "${MP_CONFIG}" ""
 MP_CONFIG := $(shell if test -x $(ROOT)/../metaproxy/metaproxy-config; then echo $(ROOT)/../metaproxy/metaproxy-config; else echo metaproxy-config; fi)
@@ -11,15 +14,15 @@ MP_SO := metaproxy_filter_xquery.so
 
 ZORBA_LIBS := -L $(ZORBA)/lib -lzorba_simplestore
 ZORBA_CFLAGS := -I$(ZORBA)/include $(MP_CFLAGS)
-CXXFLAGS := $(ZORBA_CFLAGS) $(MP_CFLAGS) -fPIC
+CXXFLAGS := -DVERSION=\"$(VERSION)\" $(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
@@ -29,7 +32,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