diff -ruN nagios-2.0b1.orig/include/locations.h.in nagios-2.0b1/include/locations.h.in

--- nagios-2.0b1.orig/include/locations.h.in	2003-08-15 12:34:10 +1100

+++ nagios-2.0b1/include/locations.h.in	2005-01-07 19:16:31 +1000

@@ -36,5 +36,5 @@

 #define DEFAULT_LOCK_FILE			"@lockfile@"

 #define DEFAULT_OBJECT_CACHE_FILE		"@localstatedir@/objects.cache"

 #define DEFAULT_EVENT_BROKER_FILE		"@localstatedir@/broker.socket"

-#define DEFAULT_P1_FILE				"@bindir@/p1.pl"	/**** EMBEDDED PERL ****/

+#define DEFAULT_P1_FILE				"@libdir@/nagios/p1.pl"	/**** EMBEDDED PERL ****/

 #define DEFAULT_AUTH_FILE			""			/**** EMBEDDED PERL - IS THIS USED? ****/

diff -ruN nagios-2.0b1.orig/Makefile.in nagios-2.0b1/Makefile.in

--- nagios-2.0b1.orig/Makefile.in	2005-01-07 19:13:15 +1000

+++ nagios-2.0b1/Makefile.in	2005-01-07 19:15:20 +1000

@@ -179,7 +179,7 @@

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

 	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(LOGDIR)/archives

 	if [ $(INSTALLPERLSTUFF) = yes ]; then \

-		$(INSTALL) -m 664 $(INSTALL_OPTS) p1.pl $(DESTDIR)$(BINDIR); \

+		$(INSTALL) -m 664 $(INSTALL_OPTS) p1.pl $(DESTDIR)/usr/lib/nagios; \

 	fi;

 	@echo ""

diff -ruN nagios-2.0b1.orig/sample-config/nagios.cfg.in nagios-2.0b1/sample-config/nagios.cfg.in

--- nagios-2.0b1.orig/sample-config/nagios.cfg.in	2004-10-31 14:16:05 +1000

+++ nagios-2.0b1/sample-config/nagios.cfg.in	2005-01-07 19:15:33 +1000

@@ -874,7 +874,7 @@

 # embedded Perl interpreter) is located.  If you didn't compile

 # Nagios with embedded Perl support, this option has no effect.

-p1_file=@bindir@/p1.pl

+p1_file=@libdir@/nagios/p1.pl