--- nagios-3.0/include/locations.h.in.p2	2008-03-29 15:14:05 +1000
+++ nagios-3.0/include/locations.h.in	2008-03-29 15:21:53 +1000
@@ -18,26 +18,26 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  ************************************************************************/
 
-#define DEFAULT_TEMP_FILE			"@localstatedir@/tempfile"
-#define DEFAULT_TEMP_PATH                       "/tmp"
+#define DEFAULT_TEMP_FILE				"@localstatedir@/lib/nagios/tempfile"
+#define DEFAULT_TEMP_PATH				"@localstatedir@/lib/nagios/tmp"
 #define DEFAULT_CHECK_RESULT_PATH		"@localstatedir@/spool/checkresults"
-#define DEFAULT_STATUS_FILE			"@localstatedir@/status.dat"
-#define DEFAULT_LOG_FILE			"@localstatedir@/nagios.log"
-#define DEFAULT_LOG_ARCHIVE_PATH		"@localstatedir@/archives/"
-#define DEFAULT_DEBUG_FILE                      "@localstatedir@/nagios.debug"
-#define DEFAULT_COMMENT_FILE			"@localstatedir@/comments.dat"
-#define DEFAULT_DOWNTIME_FILE			"@localstatedir@/downtime.dat"
-#define DEFAULT_RETENTION_FILE			"@localstatedir@/retention.dat"
-#define DEFAULT_COMMAND_FILE			"@localstatedir@/rw/nagios.cmd"
-#define DEFAULT_CONFIG_FILE			"@sysconfdir@/nagios.cfg"
-#define DEFAULT_PHYSICAL_HTML_PATH		"@datadir@"
+#define DEFAULT_STATUS_FILE				"@localstatedir@/lib/nagios/status.dat"
+#define DEFAULT_LOG_FILE				"@localstatedir@/lib/nagios/nagios.log"
+#define DEFAULT_LOG_ARCHIVE_PATH		"@localstatedir@/lib/nagios/archives/"
+#define DEFAULT_DEBUG_FILE				"@localstatedir@/lib/nagios/nagios.debug"
+#define DEFAULT_COMMENT_FILE			"@localstatedir@/lib/nagios/comments.dat"
+#define DEFAULT_DOWNTIME_FILE			"@localstatedir@/lib/nagios/downtime.dat"
+#define DEFAULT_RETENTION_FILE			"@localstatedir@/lib/nagios/retention.dat"
+#define DEFAULT_COMMAND_FILE			"@localstatedir@/lib/nagios/rw/nagios.cmd"
+#define DEFAULT_CONFIG_FILE				"@sysconfdir@/nagios/nagios.cfg"
+#define DEFAULT_PHYSICAL_HTML_PATH		"@datadir@/nagios/html"
 #define DEFAULT_URL_HTML_PATH			"@htmurl@"
-#define DEFAULT_PHYSICAL_CGIBIN_PATH		"@sbindir@"
+#define DEFAULT_PHYSICAL_CGIBIN_PATH	"@libexecdir@/nagios/cgi"
 #define DEFAULT_URL_CGIBIN_PATH			"@cgiurl@"
-#define DEFAULT_CGI_CONFIG_FILE			"@sysconfdir@/cgi.cfg"
-#define DEFAULT_LOCK_FILE			"@lockfile@"
-#define DEFAULT_OBJECT_CACHE_FILE		"@localstatedir@/objects.cache"
-#define DEFAULT_PRECACHED_OBJECT_FILE		"@localstatedir@/objects.precache"
-#define DEFAULT_EVENT_BROKER_FILE		"@localstatedir@/broker.socket"
-#define DEFAULT_P1_FILE				"@libdir@/nagios/p1.pl"	/**** EMBEDDED PERL ****/
+#define DEFAULT_CGI_CONFIG_FILE			"@sysconfdir@/nagios/cgi.cfg"
+#define DEFAULT_LOCK_FILE				"@lockfile@"
+#define DEFAULT_OBJECT_CACHE_FILE		"@localstatedir@/lib/nagios/objects.cache"
+#define DEFAULT_EVENT_BROKER_FILE		"@localstatedir@/lib/nagios/broker.socket"
+#define DEFAULT_PRECACHED_OBJECT_FILE	"@localstatedir@/lib/nagios/objects.precache"
+#define DEFAULT_P1_FILE					"@libexecdir@/nagios/p1.pl"	/**** EMBEDDED PERL ****/
 #define DEFAULT_AUTH_FILE			""			/**** EMBEDDED PERL - IS THIS USED? ****/