Use LIBRARY_VERSION for libtool.

diff --git a/base/Makefile.am b/base/Makefile.am
index 0c358e249cfe749452504e7962a0ae9d47e9145d..d95298b78d7cfb02f3fedf2c84defa7416ece394 100644 (file)
--- a/base/Makefile.am
+++ b/base/Makefile.am
@@ -56,7 +56,7 @@ libbase_la_CXXFLAGS = \
 
 libbase_la_LDFLAGS = \
        -no-undefined \
-       -version-info PACKAGE_VERSION
+       -version-info @LIBRARY_VERSION@
 
 libbase_la_LIBADD = \
        $(LIBLTDL) \

diff --git a/components/configfile/Makefile.am b/components/configfile/Makefile.am
index fc98fd555981f97a452779d1c09d640cbf4a1212..f8c21db421cced2f6b5e2b0abde615f3a1ea956c 100644 (file)
--- a/components/configfile/Makefile.am
+++ b/components/configfile/Makefile.am
@@ -18,7 +18,7 @@ configfile_la_CXXFLAGS = \
 configfile_la_LDFLAGS = \
        -module \
        -no-undefined \
-       -version-info 0:0:0
+       -version-info @LIBRARY_VERSION@
 
 configfile_la_LIBADD = \
        $(BOOST_LDFLAGS) \

diff --git a/components/configrpc/Makefile.am b/components/configrpc/Makefile.am
index dabb9e384d2ed5d4c680c6d4fc564ab935b3353f..d961db8f32942400d996416525a98c94ad3bd1e4 100644 (file)
--- a/components/configrpc/Makefile.am
+++ b/components/configrpc/Makefile.am
@@ -17,7 +17,7 @@ configrpc_la_CXXFLAGS = \
 configrpc_la_LDFLAGS = \
        -module \
        -no-undefined \
-       -version-info 0:0:0
+       -version-info @LIBRARY_VERSION@
 
 configrpc_la_LIBADD = \
        $(BOOST_LDFLAGS) \

diff --git a/components/demo/Makefile.am b/components/demo/Makefile.am
index b47f5fc2b7a850c301dfda78e4a8371c9a307dda..41bdafe6e17bec2a87afcb3db2a35e559a0dea70 100644 (file)
--- a/components/demo/Makefile.am
+++ b/components/demo/Makefile.am
@@ -18,7 +18,7 @@ demo_la_CXXFLAGS = \
 demo_la_LDFLAGS = \
        -module \
        -no-undefined \
-       -version-info 0:0:0
+       -version-info @LIBRARY_VERSION@
 
 demo_la_LIBADD = \
        $(BOOST_LDFLAGS) \

diff --git a/components/discovery/Makefile.am b/components/discovery/Makefile.am
index 41f0912cddf92f2287eb9b59ff29cdfda71f5e72..2feee2c03bb015484c224b763e8f5ffd792889ca 100644 (file)
--- a/components/discovery/Makefile.am
+++ b/components/discovery/Makefile.am
@@ -19,8 +19,8 @@ discovery_la_CXXFLAGS = \
 
 discovery_la_LDFLAGS = \
        -module \
-       -version-info 0:0:0 \
-       -no-undefined
+       -no-undefined \
+       -version-info @LIBRARY_VERSION@
 
 discovery_la_LIBADD = \
        $(BOOST_LDFLAGS) \

diff --git a/icinga/Makefile.am b/icinga/Makefile.am
index e127ac3054c5f8af838851c235da3fd1126f3e47..3881655ff772ba123e60c4683bf3e65385de4f14 100644 (file)
--- a/icinga/Makefile.am
+++ b/icinga/Makefile.am
@@ -31,7 +31,7 @@ libicinga_la_CXXFLAGS = \
 
 libicinga_la_LDFLAGS = \
        -no-undefined \
-       -version-info 0:0:0
+       -version-info @LIBRARY_VERSION@
 
 libicinga_la_LIBADD = \
        $(BOOST_LDFLAGS) \

diff --git a/icinga/icingaapplication.cpp b/icinga/icingaapplication.cpp
index 002125a7a35cc858f29a28bdabe1fc190a78af68..5ce487dc61a2276d02ab078c27bcef6d1d1aa542 100644 (file)
--- a/icinga/icingaapplication.cpp
+++ b/icinga/icingaapplication.cpp
@@ -49,7 +49,7 @@ int IcingaApplication::Main(const vector<string>& args)
 
        m_EndpointManager = make_shared<EndpointManager>();
 
-       string componentDirectory = GetExeDirectory() + "/../lib/icinga";
+       string componentDirectory = GetExeDirectory() + "/../lib/icinga2";
        AddComponentSearchDir(componentDirectory);
 
        /* register handler for 'icinga' config objects */

diff --git a/jsonrpc/Makefile.am b/jsonrpc/Makefile.am
index b4c38a4084244d3c34aada91b8ab048543167998..e4eb2d1e71ed25b3638a826d29ed3e81de51f33b 100644 (file)
--- a/jsonrpc/Makefile.am
+++ b/jsonrpc/Makefile.am
@@ -27,7 +27,7 @@ libjsonrpc_la_CXXFLAGS = \
 
 libjsonrpc_la_LDFLAGS = \
        -no-undefined \
-       -version-info 0:0:0
+       -version-info @LIBRARY_VERSION@
 
 libjsonrpc_la_LIBADD = \
        $(BOOST_LDFLAGS) \