[Nagios-checkins] nagios Makefile.in,1.20,1.21

[Ethan G. <ega...@us...>]

Update of /cvsroot/nagios/nagios
In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv23996

Modified Files:
	Makefile.in 
Log Message:
Sample confg updates, Makefile mod to create libexec directory

Index: Makefile.in
===================================================================
RCS file: /cvsroot/nagios/nagios/Makefile.in,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** Makefile.in	12 Feb 2007 22:17:32 -0000	1.20
--- Makefile.in	26 Feb 2007 15:25:20 -0000	1.21
***************
*** 2,6 ****
  # Makefile for Nagios
  #
! # Last Modified: 02-12-2007
  ###############################
  
--- 2,6 ----
  # Makefile for Nagios
  #
! # Last Modified: 02-25-2007
  ###############################
  
***************
*** 26,29 ****
--- 26,30 ----
  BINDIR=@bindir@
  CGIDIR=@sbindir@
+ LIBEXECDIR=@libexecdir@
  HTMLDIR=@datadir@
  INSTALL=@INSTALL@
***************
*** 183,186 ****
--- 184,188 ----
  
  install-basic:
+ 	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(LIBEXECDIR)
  	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(LOGDIR)
  	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(LOGDIR)/archives
***************
*** 243,261 ****
  	@echo "*** Init script installed ***"
  	@echo ""
! 	@echo "You can continue with installing Nagios as follows (type 'make'"
! 	@echo "without any arguments for a list of all possible options):"
! 	@echo ""
! 	@echo "  make install-commandmode"
! 	@echo "     - This installs and configures permissions on the"
! 	@echo "       directory for holding the external command file"
! 	@echo ""
! 	@echo "  make install-config"
! 	@echo "     - This installs *SAMPLE* config files in $(DESTDIR)$(CFGDIR)"
! 	@echo "       You'll have to modify these sample files before you can"
! 	@echo "       use Nagios.  Read the HTML documentation for more info"
! 	@echo "       on doing this.  Pay particular attention to the docs on"
! 	@echo "       object configuration files, as they determine what/how"
! 	@echo "       things get monitored!"
! 	@echo ""
  
  install-commandmode:
--- 245,249 ----
  	@echo "*** Init script installed ***"
  	@echo ""
! 
  
  install-commandmode:
***************
*** 266,280 ****
  	@echo "*** External command directory configured ***"
  	@echo ""
! 	@echo "You can continue with installing Nagios as follows (type 'make'"
! 	@echo "without any arguments for a list of all possible options):"
! 	@echo ""
! 	@echo "  make install-config"
! 	@echo "     - This installs *SAMPLE* config files in $(DESTDIR)$(CFGDIR)"
! 	@echo "       You'll have to modify these sample files before you can"
! 	@echo "       use Nagios.  Read the HTML documentation for more info"
! 	@echo "       on doing this.  Pay particular attention to the docs on"
! 	@echo "       object configuration files, as they determine what/how"
! 	@echo "       things get monitored!"
! 	@echo ""
  
  fullinstall: install install-init install-commandmode
--- 254,258 ----
  	@echo "*** External command directory configured ***"
  	@echo ""
! 
  
  fullinstall: install install-init install-commandmode