Add note about C++11 tweak

[mp-xquery-moved-to-github.git] / src / Makefile

diff --git a/src/Makefile b/src/Makefile
index 73bd1c7..dca5474 100644 (file)
--- 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,12 +14,12 @@ 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) -Wl,-rpath,$(ZORBA)/lib -shared $(CXXFLAGS) $(LDFLAGS) $^ -o $@ $(MP_LIBS) $(ZORBA_LIBS)
@@ -29,7 +32,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