Changes for Ubuntu. Primarily not worrying about upstart.

build-aux/ax_nagios_get_files

@@ -79,7 +79,7 @@ AS_CASE([$init_type],
 		src_inetd="solaris-PKG_NAME.xml",
 
 	[upstart],
-		src_init=upstart-init,
+		src_init=default-init,
 
 	[launchd],
 		src_init="mac-org.nagios.PKG_NAME.plist"

build-aux/ax_nagios_get_paths

@@ -557,8 +557,8 @@ AS_CASE([$init_type],
 		initconf=unknown,
 
 	[upstart],
-		initdir=${initdir="/etc/init"}
-		initname=${initname="$PKG_NAME.conf"}
+		initdir=${initdir="/etc/init.d"}
+		initname=${initname="$PKG_NAME"}
 		initconfdir=${initconfdir="/etc/default"}
 		initconf=${initconf="$initconfdir/$PKG_NAME"},
 

src/Makefile.in

@@ -30,6 +30,7 @@ NAGIOS_INSTALL_OPTS=@NAGIOS_INSTALL_OPTS@
 NRPE_INSTALL_OPTS=@NRPE_INSTALL_OPTS@
 
 PLUGINSDIR=@pluginsdir@
+PIDDIR=@piddir@
 
 #AC_SUBST(pkgsysconfdir)
 #AC_SUBST(objsysconfdir)
@@ -40,7 +41,6 @@ PLUGINSDIR=@pluginsdir@
 #AC_SUBST(privatesysconfdir)
 #AC_SUBST(pkglocalstatedir)
 #AC_SUBST(logdir)
-#AC_SUBST(piddir)
 #AC_SUBST(pipedir)
 #AC_SUBST(spooldir)
 #AC_SUBST(tmpfilesd)
@@ -73,6 +73,10 @@ install-plugin:
 install-daemon:
 	$(INSTALL) -m 755 -d $(SBINDIR)
 	$(INSTALL) -m 755 nrpe $(SBINDIR)
+	@if ! test -d "$PIDDIR" ; then \
+		echo $(INSTALL) -m 755 $(NRPE_INSTALL_OPTS) -d $(PIDDIR); \
+		$(INSTALL) -m 755 $(NRPE_INSTALL_OPTS) -d $(PIDDIR); \
+	fi
 
 clean:
 	rm -f core nrpe check_nrpe $(SNPRINTF_O)