From 5157853af94e2a44fe0856b1d27e57ac99dbc325 Mon Sep 17 00:00:00 2001 From: Gunnar Beutner Date: Wed, 26 Sep 2012 12:08:07 +0200 Subject: [PATCH] Add right lib dir to the search path. --- icinga-app/Makefile.am | 3 ++- icinga-app/icinga.cpp | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/icinga-app/Makefile.am b/icinga-app/Makefile.am index 6730de81e..fb27b3287 100644 --- a/icinga-app/Makefile.am +++ b/icinga-app/Makefile.am @@ -17,7 +17,8 @@ icinga2_CPPFLAGS = \ -I${top_srcdir}/lib/config \ -I${top_srcdir}/lib/remoting \ -I${top_srcdir}/lib/icinga \ - -I${top_srcdir} + -I${top_srcdir} \ + -DICINGA_LIBDIR="\"$(pkglibdir)\"" icinga2_LDFLAGS = \ $(BOOST_LDFLAGS) diff --git a/icinga-app/icinga.cpp b/icinga-app/icinga.cpp index a35e9dd52..f59777501 100644 --- a/icinga-app/icinga.cpp +++ b/icinga-app/icinga.cpp @@ -66,6 +66,10 @@ int main(int argc, char **argv) Component::AddSearchDir(exeDirectory + "/../lib/icinga2"); Component::AddSearchDir(exeDirectory + "/../lib64/icinga2"); +#ifdef ICINGA_LIBDIR + Component::AddSearchDir(ICINGA_LIBDIR); +#endif /* ICINGA_LIBDIR */ + DynamicObject::BeginTx(); /* load config file */