diff -ruN nagios-2.0b2.orig/base/Makefile.in nagios-2.0b2/base/Makefile.in
--- nagios-2.0b2.orig/base/Makefile.in	2004-12-09 16:48:33 +1000
+++ nagios-2.0b2/base/Makefile.in	2005-02-13 12:09:11 +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@
@@ -181,10 +182,8 @@
 devclean: distclean
 
 install:
-	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(BINDIR)
-	$(INSTALL) -m 774 $(INSTALL_OPTS) @nagios_name@ $(DESTDIR)$(BINDIR)
-	$(STRIP) $(DESTDIR)$(BINDIR)/@nagios_name@
-	$(INSTALL) -m 774 $(INSTALL_OPTS) @nagiostats_name@ $(DESTDIR)$(BINDIR)
-	$(STRIP) $(DESTDIR)$(BINDIR)/@nagiostats_name@
-
-
+	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(SBINDIR)
+	$(INSTALL) -m 774 $(INSTALL_OPTS) @nagios_name@ $(DESTDIR)$(SBINDIR)
+	$(STRIP) $(DESTDIR)$(SBINDIR)/@nagios_name@
+	$(INSTALL) -m 774 $(INSTALL_OPTS) @nagiostats_name@ $(DESTDIR)$(SBINDIR)
+	$(STRIP) $(DESTDIR)$(SBINDIR)/@nagiostats_name@
diff -ruN nagios-2.0b2.orig/cgi/Makefile.in nagios-2.0b2/cgi/Makefile.in
--- nagios-2.0b2.orig/cgi/Makefile.in	2004-10-25 16:05:54 +1100
+++ nagios-2.0b2/cgi/Makefile.in	2005-02-13 12:09:11 +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.0b2.orig/common/Makefile.in nagios-2.0b2/common/Makefile.in
--- nagios-2.0b2.orig/common/Makefile.in	2003-04-10 14:46:01 +1100
+++ nagios-2.0b2/common/Makefile.in	2005-02-13 12:09:11 +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.0b2.orig/contrib/Makefile.in nagios-2.0b2/contrib/Makefile.in
--- nagios-2.0b2.orig/contrib/Makefile.in	2004-10-30 05:03:41 +1100
+++ nagios-2.0b2/contrib/Makefile.in	2005-02-13 12:09:11 +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.0b2.orig/html/Makefile.in nagios-2.0b2/html/Makefile.in
--- nagios-2.0b2.orig/html/Makefile.in	2003-04-10 14:46:02 +1100
+++ nagios-2.0b2/html/Makefile.in	2005-02-13 12:09:11 +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.0b2.orig/Makefile.in nagios-2.0b2/Makefile.in
--- nagios-2.0b2.orig/Makefile.in	2004-12-16 11:15:24 +1000
+++ nagios-2.0b2/Makefile.in	2005-02-13 12:09:41 +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@
@@ -205,13 +207,13 @@
 
 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/bigger.cfg $(DESTDIR)$(CFGDIR)/bigger.cfg-sample
-	$(INSTALL) -m 664 $(INSTALL_OPTS) sample-config/template-object/minimal.cfg $(DESTDIR)$(CFGDIR)/minimal.cfg-sample
-	$(INSTALL) -m 664 $(INSTALL_OPTS) sample-config/template-object/checkcommands.cfg $(DESTDIR)$(CFGDIR)/checkcommands.cfg-sample
-	$(INSTALL) -m 664 $(INSTALL_OPTS) sample-config/template-object/misccommands.cfg $(DESTDIR)$(CFGDIR)/misccommands.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/bigger.cfg $(DESTDIR)$(CFGDIR)/bigger.cfg
+	$(INSTALL) -m 664 $(INSTALL_OPTS) sample-config/template-object/minimal.cfg $(DESTDIR)$(CFGDIR)/minimal.cfg
+	$(INSTALL) -m 664 $(INSTALL_OPTS) sample-config/template-object/checkcommands.cfg $(DESTDIR)$(CFGDIR)/checkcommands.cfg
+	$(INSTALL) -m 664 $(INSTALL_OPTS) sample-config/template-object/misccommands.cfg $(DESTDIR)$(CFGDIR)/misccommands.cfg
 
 	@echo ""
 	@echo "*** Sample config file installed ***"
diff -ruN nagios-2.0b2.orig/module/Makefile.in nagios-2.0b2/module/Makefile.in
--- nagios-2.0b2.orig/module/Makefile.in	2003-08-19 15:19:11 +1100
+++ nagios-2.0b2/module/Makefile.in	2005-02-13 12:09:11 +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@