aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Ton Voon <tonvoon@users.sourceforge.net> 2005-09-14 12:40:26 +0000
committerGravatar Ton Voon <tonvoon@users.sourceforge.net> 2005-09-14 12:40:26 +0000
commit63e9193516f2aa2edbbf7f0dadbdf4694c0821cb (patch)
tree8dec7ac1b5bcc624af06f5d9be94970f182e9deb
parent20d0154211fa46028383ed3a88b558731313c389 (diff)
downloadmonitoring-plugins-63e9193516f2aa2edbbf7f0dadbdf4694c0821cb.tar.gz
Some makes do not like blank lines after "\". Fixed check_ldaps to only
generate if check_ldap was created (Chester Hosey) git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1219 f882894a-f735-0410-b71e-b25c423dba1c
-rw-r--r--plugins/Makefile.am13
1 files changed, 6 insertions, 7 deletions
diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index 87a97a9f..1e19bc7a 100644
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -2,8 +2,7 @@
VPATH = $(top_srcdir) $(top_srcdir)/lib $(top_srcdir)/plugins $(top_srcdir)/plugins/t
-INCLUDES = -I.. -I$(top_srcdir)/lib -I$(top_srcdir)/intl \
-@LDAPINCLUDE@ @PGINCLUDE@
+INCLUDES = -I.. -I$(top_srcdir)/lib -I$(top_srcdir)/intl @LDAPINCLUDE@ @PGINCLUDE@
datadir = @datadir@
localedir = $(datadir)/locale
@@ -14,11 +13,11 @@ MATHLIBS = @MATHLIBS@
libexec_PROGRAMS = check_dhcp check_disk check_dummy check_http check_load \
check_mrtg check_mrtgtraf check_nwstat check_overcr check_ping \
check_real check_smtp check_ssh check_tcp check_time \
- check_udp check_ups check_users negate urlize check_icmp\
- @EXTRAS@
+ check_udp check_ups check_users negate urlize \
+ check_icmp @EXTRAS@
-check_tcp_programs = check_ftp check_imap check_nntp check_pop check_udp2 \
- @check_tcp_ssl@
+check_tcp_programs = check_ftp check_imap check_nntp check_pop \
+ check_udp2 @check_tcp_ssl@
EXTRA_PROGRAMS = check_mysql check_radius check_pgsql check_snmp check_hpjd \
check_swap check_fping check_ldap check_game check_dig \
@@ -144,7 +143,7 @@ $(check_tcp_programs): check_tcp
install-exec-hook:
cd $(DESTDIR)$(libexecdir) && \
for i in $(check_tcp_programs) ; do rm -f $$i; ln -s check_tcp $$i ; done ;\
- rm -f check_ldaps ; ln -s -f check_ldap check_ldaps
+ if [ -x check_ldaps ] ; then rm -f check_ldaps ; ln -s check_ldap check_ldaps ; fi
clean-local:
rm -f $(check_tcp_programs)