diff -ruN nagios-2.6.orig/base/Makefile.in nagios-2.6/base/Makefile.in

--- nagios-2.6.orig/base/Makefile.in	2006-05-31 03:31:44 +1100

+++ nagios-2.6/base/Makefile.in	2006-11-30 00:33:38 +1000

@@ -26,14 +26,15 @@

 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@

@@ -188,12 +189,12 @@

 	 $(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 774 $(INSTALL_OPTS) @nagios_name@ $(DESTDIR)$(SBINDIR)

+	$(INSTALL) -m 774 $(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@

diff -ruN nagios-2.6.orig/cgi/Makefile.in nagios-2.6/cgi/Makefile.in

--- nagios-2.6.orig/cgi/Makefile.in	2006-05-31 03:31:44 +1100

+++ nagios-2.6/cgi/Makefile.in	2006-11-30 00:33:38 +1000

@@ -12,14 +12,15 @@

 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@

diff -ruN nagios-2.6.orig/common/Makefile.in nagios-2.6/common/Makefile.in

--- nagios-2.6.orig/common/Makefile.in	2003-04-10 14:46:01 +1100

+++ nagios-2.6/common/Makefile.in	2006-11-30 00:33:38 +1000

@@ -14,13 +14,13 @@

 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@

diff -ruN nagios-2.6.orig/contrib/Makefile.in nagios-2.6/contrib/Makefile.in

--- nagios-2.6.orig/contrib/Makefile.in	2005-11-15 11:49:36 +1000

+++ nagios-2.6/contrib/Makefile.in	2006-11-30 00:33:38 +1000

@@ -15,8 +15,8 @@

 # Generated automatically from configure script

 SNPRINTF_O=@SNPRINTF_O@

 INSTALL=@INSTALL@

-INSTALL_OPTS=@INSTALL_OPTS@

-CGIDIR=@sbindir@

+INSTALL_OPTS=

+CGIDIR=@libexecdir@/nagios/cgi

 BINDIR=@bindir@

 CGIS=traceroute.cgi

diff -ruN nagios-2.6.orig/html/Makefile.in nagios-2.6/html/Makefile.in

--- nagios-2.6.orig/html/Makefile.in	2006-05-31 03:31:44 +1100

+++ nagios-2.6/html/Makefile.in	2006-11-30 00:33:38 +1000

@@ -4,13 +4,13 @@

 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@

diff -ruN nagios-2.6.orig/Makefile.in nagios-2.6/Makefile.in

--- nagios-2.6.orig/Makefile.in	2006-11-28 12:29:04 +1000

+++ nagios-2.6/Makefile.in	2006-11-30 00:34:13 +1000

@@ -21,17 +21,19 @@

 prefix=@prefix@

 exec_prefix=@exec_prefix@

-LOGDIR=@localstatedir@

-CFGDIR=@sysconfdir@

+LOCALSTATEDIR=@localstatedir@/nagios

+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=

 INIT_DIR=@init_dir@

-INIT_OPTS=-o root -g root

-CGICFGDIR=$(CGIDIR)

+INIT_OPTS=

+CGICFGDIR=$(CFGDIR)

 PERLDIR=@PERLDIR@

 INSTALLPERLSTUFF=@INSTALLPERLSTUFF@

@@ -214,11 +216,11 @@

 install-config:

 	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(CFGDIR)

-	$(INSTALL) -m 664 $(INSTALL_OPTS) sample-config/nagios.cfg $(DESTDIR)$(CFGDIR)/nagios.cfg-sample

-	$(INSTALL) -m 664 $(INSTALL_OPTS) sample-config/cgi.cfg $(DESTDIR)$(CFGDIR)/cgi.cfg-sample

-	$(INSTALL) -m 660 $(INSTALL_OPTS) sample-config/resource.cfg $(DESTDIR)$(CFGDIR)/resource.cfg-sample

-	$(INSTALL) -m 664 $(INSTALL_OPTS) sample-config/template-object/localhost.cfg $(DESTDIR)$(CFGDIR)/localhost.cfg-sample

-	$(INSTALL) -m 664 $(INSTALL_OPTS) sample-config/template-object/commands.cfg $(DESTDIR)$(CFGDIR)/commands.cfg-sample

+	$(INSTALL) -m 664 $(INSTALL_OPTS) sample-config/nagios.cfg $(DESTDIR)$(CFGDIR)/nagios.cfg

+	$(INSTALL) -m 664 $(INSTALL_OPTS) sample-config/cgi.cfg $(DESTDIR)$(CFGDIR)/cgi.cfg

+	$(INSTALL) -m 660 $(INSTALL_OPTS) sample-config/resource.cfg $(DESTDIR)$(CFGDIR)/resource.cfg

+	$(INSTALL) -m 664 $(INSTALL_OPTS) sample-config/template-object/localhost.cfg $(DESTDIR)$(CFGDIR)/localhost.cfg

+	$(INSTALL) -m 664 $(INSTALL_OPTS) sample-config/template-object/commands.cfg $(DESTDIR)$(CFGDIR)/commands.cfg

 	@echo ""

 	@echo "*** Sample config file installed ***"

diff -ruN nagios-2.6.orig/module/Makefile.in nagios-2.6/module/Makefile.in

--- nagios-2.6.orig/module/Makefile.in	2005-11-26 17:05:36 +1000

+++ nagios-2.6/module/Makefile.in	2006-11-30 00:33:38 +1000

@@ -17,7 +17,7 @@

 exec_prefix=@exec_prefix@

 BINDIR=@bindir@

 INSTALL=@INSTALL@

-INSTALL_OPTS=@INSTALL_OPTS@

+INSTALL_OPTS=

 COMMAND_OPTS=@COMMAND_OPTS@

 STRIP=@STRIP@