Fixed VPATH problem in plugins-root (Tom Payerle - 1789000)

[nagiosplug.git] / plugins-root / Makefile.am

diff --git a/plugins-root/Makefile.am b/plugins-root/Makefile.am
index 5a2af85b2bb3c5f1e079c14677c2cbbe4a5d1a73..e61ebc75fa605b220a3ce3e9a9881746cf82b316 100644 (file)
--- a/plugins-root/Makefile.am
+++ b/plugins-root/Makefile.am
@@ -1,8 +1,8 @@
 ## Process this file with automake to produce Makefile.in
 
-VPATH = $(top_srcdir) $(top_srcdir)/lib $(top_srcdir)/plugins $(top_srcdir)/plugins/t 
+VPATH = $(top_srcdir) $(top_srcdir)/lib $(top_srcdir)/plugins $(top_srcdir)/plugins/t $(srcdir)
 
-INCLUDES = -I.. -I$(top_srcdir)/lib -I$(top_srcdir)/intl -I$(top_srcdir)/plugins @SSLINCLUDE@
+INCLUDES = -I.. -I$(top_srcdir)/lib -I$(top_srcdir)/gl -I$(top_srcdir)/intl -I$(top_srcdir)/plugins @SSLINCLUDE@
 
 datadir = @datadir@
 localedir = $(datadir)/locale
@@ -15,7 +15,7 @@ EXTRA_PROGRAMS = pst3
 
 EXTRA_DIST = pst3.c
 
-BASEOBJS = ../plugins/utils.o ../lib/libnagiosplug.a ../lib/libcoreutils.a
+BASEOBJS = ../plugins/utils.o ../lib/libnagiosplug.a ../gl/libgnu.a
 NETOBJS = ../plugins/netutils.o $(BASEOBJS) $(EXTRA_NETOBJS)
 NETLIBS = $(NETOBJS) $(SOCKETLIBS)
 
@@ -26,7 +26,7 @@ TESTS = @PLUGIN_TEST@
 test:
        perl -I $(top_builddir) -I $(top_srcdir) ../test.pl
 
-setuid_root_mode = 4550
+setuid_root_mode = ug=rx,u+s
 
 # /* Author Coreutils team - see ACKNOWLEDGEMENTS */
 
@@ -67,8 +67,8 @@ install-exec-local: $(noinst_PROGRAMS)
 ##############################################################################
 # the actual targets
 check_dhcp_LDADD = $(NETLIBS)
-check_icmp_LDADD = $(SOCKETLIBS)
+check_icmp_LDADD = $(NETLIBS) $(SOCKETLIBS)
 pst3_LDADD = -lkvm
 
 check_dhcp_DEPENDENCIES = check_dhcp.c $(NETOBJS) $(DEPLIBS) 
-check_icmp_DEPENDENCIES = check_icmp.c
+check_icmp_DEPENDENCIES = check_icmp.c $(NETOBJS)