--- nagios-3.0.2/Makefile.in.p0	2008-04-14 05:34:26 +1100
+++ nagios-3.0.2/Makefile.in	2008-05-27 09:04:13 +1100
@@ -21,19 +21,21 @@ LDFLAGS=@LDFLAGS@ @LIBS@
 
 prefix=@prefix@
 exec_prefix=@exec_prefix@
-LOGDIR=@localstatedir@
+LOCALSTATEDIR=@localstatedir@/lib/nagios
+LOGDIR=/var/log/nagios
 CHECKRESULTDIR=@CHECKRESULTDIR@
-CFGDIR=@sysconfdir@
+CFGDIR=@sysconfdir@/nagios
 BINDIR=@bindir@
-CGIDIR=@sbindir@
+SBINDIR=@sbindir@
+CGIDIR=@libexecdir@/nagios/cgi
 LIBEXECDIR=@libexecdir@
-HTMLDIR=@datadir@
+HTMLDIR=@datadir@/nagios/html
 INSTALL=@INSTALL@
-INSTALL_OPTS=@INSTALL_OPTS@
-COMMAND_OPTS=@COMMAND_OPTS@
+INSTALL_OPTS=
+COMMAND_OPTS=
 HTTPD_CONF=@HTTPD_CONF@
 INIT_DIR=@init_dir@
-INIT_OPTS=-o root -g root
+INIT_OPTS=
 CGICFGDIR=$(CGIDIR)
 PERLDIR=@PERLDIR@
 
@@ -221,18 +223,23 @@ install-basic:
 
 install-config:
 	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(CFGDIR)
+	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(CFGDIR)/commands
+	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(CFGDIR)/contacts
+	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(CFGDIR)/templates
+	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(CFGDIR)/timeperiods
 	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(CFGDIR)/objects
+	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(CFGDIR)/examples
 	$(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/nagios.cfg $(DESTDIR)$(CFGDIR)/nagios.cfg
 	$(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/cgi.cfg $(DESTDIR)$(CFGDIR)/cgi.cfg
 	$(INSTALL) -b -m 660 $(INSTALL_OPTS) sample-config/resource.cfg $(DESTDIR)$(CFGDIR)/resource.cfg
-	$(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/template-object/templates.cfg $(DESTDIR)$(CFGDIR)/objects/templates.cfg
-	$(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/template-object/commands.cfg $(DESTDIR)$(CFGDIR)/objects/commands.cfg
-	$(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/template-object/contacts.cfg $(DESTDIR)$(CFGDIR)/objects/contacts.cfg
-	$(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/template-object/timeperiods.cfg $(DESTDIR)$(CFGDIR)/objects/timeperiods.cfg
+	$(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/template-object/templates.cfg $(DESTDIR)$(CFGDIR)/templates/00-templates.cfg
+	$(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/template-object/commands.cfg $(DESTDIR)$(CFGDIR)/commands/00-commands.cfg
+	$(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/template-object/contacts.cfg $(DESTDIR)$(CFGDIR)/contacts/00-contacts.cfg
+	$(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/template-object/timeperiods.cfg $(DESTDIR)$(CFGDIR)/timeperiods/00-timeperiods.cfg
 	$(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/template-object/localhost.cfg $(DESTDIR)$(CFGDIR)/objects/localhost.cfg
-	$(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/template-object/windows.cfg $(DESTDIR)$(CFGDIR)/objects/windows.cfg
-	$(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/template-object/printer.cfg $(DESTDIR)$(CFGDIR)/objects/printer.cfg
-	$(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/template-object/switch.cfg $(DESTDIR)$(CFGDIR)/objects/switch.cfg
+	$(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/template-object/windows.cfg $(DESTDIR)$(CFGDIR)/examples/windows.cfg
+	$(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/template-object/printer.cfg $(DESTDIR)$(CFGDIR)/examples/printer.cfg
+	$(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/template-object/switch.cfg $(DESTDIR)$(CFGDIR)/examples/switch.cfg
 
 	@echo ""
 	@echo "*** Config files installed ***"
@@ -261,13 +268,23 @@ install-daemoninit:
 
 
 install-commandmode:
-	$(INSTALL) -m 775 $(COMMAND_OPTS) -d $(DESTDIR)$(LOGDIR)/rw
-	chmod g+s $(DESTDIR)$(LOGDIR)/rw
+	$(INSTALL) -m 775 $(COMMAND_OPTS) -d $(DESTDIR)$(LOCALSTATEDIR)/rw
 
 	@echo ""
 	@echo "*** External command directory configured ***"
 	@echo ""
 
+install-contrib:
+	$(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(LIBEXECDIR)/nagios/contrib
+	for file in convertcfg traceroute.cgi mini_epn new_mini_epn p1.pl; do \
+		$(INSTALL) -m 775 $(INSTALL_OPTS) contrib/$$file $(DESTDIR)$(LIBEXECDIR)/nagios/contrib/; \
+	done
+	$(INSTALL) -m 775 $(INSTALL_OPTS) contrib/p1.pl  $(DESTDIR)$(LIBEXECDIR)/nagios/
+	$(INSTALL) -m 644 $(INSTALL_OPTS) contrib/README $(DESTDIR)$(LIBEXECDIR)/nagios/contrib/
+
+	@echo ""
+	@echo "*** Contrib programs installed ***"
+	@echo ""
 
 fullinstall: install install-init install-commandmode install-webconf
 
--- nagios-3.0.2/base/Makefile.in.p0	2008-02-29 05:25:45 +1000
+++ nagios-3.0.2/base/Makefile.in	2008-05-27 09:04:13 +1100
@@ -33,14 +33,15 @@ LIBS=@LIBS@ @GLIB_LIBS@
 
 prefix=@prefix@
 exec_prefix=@exec_prefix@
-LOGDIR=@localstatedir@
-CFGDIR=@sysconfdir@
+LOGDIR=/var/log/nagios
+CFGDIR=@sysconfdir@/nagios
 BINDIR=@bindir@
-CGIDIR=@sbindir@
-HTMLDIR=@datadir@
+SBINDIR=@sbindir@
+CGIDIR=@libexecdir@/nagios/cgi
+HTMLDIR=@datadir@/nagios/html
 INSTALL=@INSTALL@
-INSTALL_OPTS=@INSTALL_OPTS@
-COMMAND_OPTS=@COMMAND_OPTS@
+INSTALL_OPTS=
+COMMAND_OPTS=
 STRIP=@STRIP@
 
 CGIURL=@cgiurl@
@@ -202,10 +203,10 @@ install-unstripped:
 	$(MAKE) install-basic
 
 install-basic:
-	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(BINDIR)
-	$(INSTALL) -m 774 $(INSTALL_OPTS) @nagios_name@ $(DESTDIR)$(BINDIR)
-	$(INSTALL) -m 774 $(INSTALL_OPTS) @nagiostats_name@ $(DESTDIR)$(BINDIR)
+	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(SBINDIR)
+	$(INSTALL) -m 711 $(INSTALL_OPTS) @nagios_name@ $(DESTDIR)$(SBINDIR)
+	$(INSTALL) -m 711 $(INSTALL_OPTS) @nagiostats_name@ $(DESTDIR)$(SBINDIR)
 
 strip-post-install:
-	$(STRIP) $(DESTDIR)$(BINDIR)/@nagios_name@
-	$(STRIP) $(DESTDIR)$(BINDIR)/@nagiostats_name@
+	$(STRIP) $(DESTDIR)$(SBINDIR)/@nagios_name@
+	$(STRIP) $(DESTDIR)$(SBINDIR)/@nagiostats_name@
--- nagios-3.0.2/cgi/Makefile.in.p0	2008-02-29 05:26:36 +1000
+++ nagios-3.0.2/cgi/Makefile.in	2008-05-27 09:04:13 +1100
@@ -12,14 +12,15 @@ SRC_XDATA=../xdata
 
 prefix=@prefix@
 exec_prefix=@exec_prefix@
-LOGDIR=@localstatedir@
-CFGDIR=@sysconfdir@
+LOGDIR=/var/log/nagios
+CFGDIR=@sysconfdir@/nagios
 BINDIR=@bindir@
-CGIDIR=@sbindir@
-HTMLDIR=@datadir@
+SBINDIR=@sbindir@
+CGIDIR=@libexecdir@/nagios/cgi
+HTMLDIR=@datadir@/nagios/html
 INSTALL=@INSTALL@
-INSTALL_OPTS=@INSTALL_OPTS@
-COMMAND_OPTS=@COMMAND_OPTS@
+INSTALL_OPTS=
+COMMAND_OPTS=
 STRIP=@STRIP@
 
 CGIEXTRAS=@CGIEXTRAS@
--- nagios-3.0.2/common/Makefile.in.p0	2003-04-10 14:46:01 +1100
+++ nagios-3.0.2/common/Makefile.in	2008-05-27 09:04:13 +1100
@@ -14,13 +14,13 @@ LDFLAGS=@LDFLAGS@ @LIBS@
 
 prefix=@prefix@
 exec_prefix=@exec_prefix@
-LOGDIR=@localstatedir@
-CFGDIR=@sysconfdir@
+LOGDIR=/var/log/nagios
+CFGDIR=@sysconfdir@/nagios
 BINDIR=@bindir@
-CGIDIR=@sbindir@
-HTMLDIR=@datadir@
+CGIDIR=@sbindir@/nagios/cgi
+HTMLDIR=@datadir@/nagios/html
 INSTALL=@INSTALL@
-INSTALL_OPTS=@INSTALL_OPTS@
+INSTALL_OPTS=
 COMMAND_OPTS=@COMMAND_OPTS@
 
 CP=@CP@
--- nagios-3.0.2/contrib/Makefile.in.p0	2008-05-20 05:01:58 +1100
+++ nagios-3.0.2/contrib/Makefile.in	2008-05-27 09:05:11 +1100
@@ -15,12 +15,12 @@ SRC_CGI=../cgi
 # Generated automatically from configure script
 SNPRINTF_O=@SNPRINTF_O@
 INSTALL=@INSTALL@
-INSTALL_OPTS=@INSTALL_OPTS@
+INSTALL_OPTS=
 
 
 prefix=@prefix@
 exec_prefix=@exec_prefix@
-CGIDIR=@sbindir@
+CGIDIR=@libexecdir@/nagios/cgi
 BINDIR=@bindir@
 
 CGIS=traceroute.cgi
--- nagios-3.0.2/html/Makefile.in.p0	2008-01-10 03:51:25 +1000
+++ nagios-3.0.2/html/Makefile.in	2008-05-27 09:04:13 +1100
@@ -4,13 +4,13 @@ LDFLAGS=@LDFLAGS@ @LIBS@
 
 prefix=@prefix@
 exec_prefix=@exec_prefix@
-LOGDIR=@localstatedir@
-CFGDIR=@sysconfdir@
+LOGDIR=/var/log/nagios
+CFGDIR=@sysconfdir@/nagios
 BINDIR=@bindir@
-CGIDIR=@sbindir@
-HTMLDIR=@datadir@
+CGIDIR=@libexecdir@/nagios/cgi
+HTMLDIR=@datadir@/nagios/html
 INSTALL=@INSTALL@
-INSTALL_OPTS=@INSTALL_OPTS@
+INSTALL_OPTS=
 COMMAND_OPTS=@COMMAND_OPTS@
 
 CP=@CP@
--- nagios-3.0.2/module/Makefile.in.p0	2007-12-15 09:02:24 +1000
+++ nagios-3.0.2/module/Makefile.in	2008-05-27 09:04:13 +1100
@@ -19,7 +19,7 @@ prefix=@prefix@
 exec_prefix=@exec_prefix@
 BINDIR=@bindir@
 INSTALL=@INSTALL@
-INSTALL_OPTS=@INSTALL_OPTS@
+INSTALL_OPTS=
 COMMAND_OPTS=@COMMAND_OPTS@
 STRIP=@STRIP@