File nagios.p1.pl-location.patch of Package nagios

Overview Repositories Revisions Requests Users Attributes Meta

File nagios.p1.pl-location.patch of Package nagios (Revision f9cef512f7b89812b382424458cad869)

Currently displaying revision f9cef512f7b89812b382424458cad869 , Show latest

---
 Makefile.in                 |    3 ++-
 configure.in                |    1 +
 include/locations.h.in      |    2 +-
 sample-config/nagios.cfg.in |    2 +-
 4 files changed, 5 insertions(+), 3 deletions(-)

--- a/Makefile.in
+++ b/Makefile.in
@@ -23,6 +23,7 @@ prefix=@prefix@
 exec_prefix=@exec_prefix@
 LOGDIR=@localstatedir@
 CFGDIR=@sysconfdir@
+P1PLDIR=@p1pldir@
 BINDIR=@bindir@
 CGIDIR=@sbindir@
 HTMLDIR=@datadir@
@@ -185,7 +186,7 @@ install-basic:
 	$(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)$(P1PLDIR); \
 	fi;
 
 	@echo ""
--- a/configure.in
+++ b/configure.in
@@ -16,6 +16,7 @@ PKG_REL_DATE="04-10-2007"
 dnl Figure out how to invoke "install" and what install options to use.
 AC_PROG_INSTALL
 AC_SUBST(INSTALL)
+AC_SUBST(P1PLDIR)
 
 dnl What OS are we running?
 AC_CANONICAL_HOST
--- a/include/locations.h.in
+++ b/include/locations.h.in
@@ -35,5 +35,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				"@p1pldir@/p1.pl"	/**** EMBEDDED PERL ****/
 #define DEFAULT_AUTH_FILE			""			/**** EMBEDDED PERL - IS THIS USED? ****/
--- a/sample-config/nagios.cfg.in
+++ b/sample-config/nagios.cfg.in
@@ -875,7 +875,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=@p1pldir@/p1.pl

Places

File nagios.p1.pl-location.patch of Package nagios (Revision f9cef512f7b89812b382424458cad869)

Places