Skip to content

Commit

Permalink
livestatus: Use pkg-config file provided by naemon-core
Browse files Browse the repository at this point in the history
It is not a good idea to hard code the NAEMON_LIBS & NAEMON_CFLAGS,
since it is liable to break when those change in the naemon-core project
itself.

Signed-off-by: Anton Lofgren <alofgren@op5.com>
  • Loading branch information
Anton Lofgren committed Feb 26, 2016
1 parent 11046b0 commit c32c8c8
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ naemon-core:
cd naemon-core && make

naemon-livestatus:
cd naemon-livestatus && make CPPFLAGS="$$CPPFLAGS -I$$(pwd)/../naemon-core/src"
cd naemon-livestatus && make CPPFLAGS="$$CPPFLAGS"

update: update-naemon-core update-naemon-livestatus
@if [ `git status 2>/dev/null | grep -c "new commits"` -gt 0 ]; then \
Expand Down
2 changes: 1 addition & 1 deletion configure
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ test -f ./configure || autoreconf -i

cd ../naemon-livestatus
test -f ./configure || autoreconf -i
NAEMON_LIBS="-L$(pwd)/../naemon-core" NAEMON_CFLAGS="-I$(pwd)/../naemon-core" ./configure $*
PKG_CONFIG_PATH="$(pwd)/../naemon-core" ./configure $*

echo "***************************************"
echo "finished configuring Naemon."
Expand Down

0 comments on commit c32c8c8

Please sign in to comment.