tyler.durden
/
icinga2
mirror of https://github.com/Icinga/icinga2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add right lib dir to the search path.

This commit is contained in:
Gunnar Beutner 2012-09-26 12:08:07 +02:00
parent d6874052c6
commit 5157853af9
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
icinga-app/Makefile.am
View File

@ -17,7 +17,8 @@ icinga2_CPPFLAGS = \
-I${top_srcdir}/lib/config \ -I${top_srcdir}/lib/config \
-I${top_srcdir}/lib/remoting \ -I${top_srcdir}/lib/remoting \
-I${top_srcdir}/lib/icinga \ -I${top_srcdir}/lib/icinga \
-I${top_srcdir} -I${top_srcdir} \
-DICINGA_LIBDIR="\"$(pkglibdir)\""
icinga2_LDFLAGS = \ icinga2_LDFLAGS = \
$(BOOST_LDFLAGS) $(BOOST_LDFLAGS)

4
icinga-app/icinga.cpp
View File

@ -66,6 +66,10 @@ int main(int argc, char **argv)
Component::AddSearchDir(exeDirectory + "/../lib/icinga2"); Component::AddSearchDir(exeDirectory + "/../lib/icinga2");
Component::AddSearchDir(exeDirectory + "/../lib64/icinga2"); Component::AddSearchDir(exeDirectory + "/../lib64/icinga2");
#ifdef ICINGA_LIBDIR
Component::AddSearchDir(ICINGA_LIBDIR);
#endif /* ICINGA_LIBDIR */
DynamicObject::BeginTx(); DynamicObject::BeginTx();
/* load config file */ /* load config file */