--- nagios-3.0.2/Makefile.in.p1	2008-05-27 10:14:27 +1100
+++ nagios-3.0.2/Makefile.in	2008-05-27 10:14:27 +1100
@@ -200,7 +200,7 @@ install-basic:
 	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(LOGDIR)/archives
 	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(CHECKRESULTDIR)
 	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 ""
--- nagios-3.0.2/include/locations.h.in.p1	2007-05-01 09:45:57 +1100
+++ nagios-3.0.2/include/locations.h.in	2008-05-27 10:14:27 +1100
@@ -39,5 +39,5 @@
 #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				"@bindir@/p1.pl"	/**** EMBEDDED PERL ****/
+#define DEFAULT_P1_FILE				"@libdir@/nagios/p1.pl"	/**** EMBEDDED PERL ****/
 #define DEFAULT_AUTH_FILE			""			/**** EMBEDDED PERL - IS THIS USED? ****/
--- nagios-3.0.2/sample-config/nagios.cfg.in.p1	2008-05-20 05:02:08 +1100
+++ nagios-3.0.2/sample-config/nagios.cfg.in	2008-05-27 10:14:27 +1100
@@ -1081,7 +1081,7 @@ date_format=us
 # 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