From: Gunnar Beutner <gunnar@beutner.name>
Date: Sun, 27 May 2012 11:35:55 +0000 (+0200)
Subject: Use LIBRARY_VERSION for libtool.
X-Git-Tag: v0.0.1~474
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2864460419338fb0c0420b7c7f6716b677dda32d;p=icinga2

Use LIBRARY_VERSION for libtool.
---

diff --git a/base/Makefile.am b/base/Makefile.am
index 0c358e249..d95298b78 100644
--- 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 fc98fd555..f8c21db42 100644
--- 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 dabb9e384..d961db8f3 100644
--- 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 b47f5fc2b..41bdafe6e 100644
--- 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 41f0912cd..2feee2c03 100644
--- 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 e127ac305..3881655ff 100644
--- 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 002125a7a..5ce487dc6 100644
--- 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 b4c38a408..e4eb2d1e7 100644
--- 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) \