More minor changes from testing

Makefile.in

@@ -90,10 +90,9 @@ install-inetd:
 		echo $(INSTALL) -m 644 startup/$(SRC_INETD) $(INETD_DIR)/$(INETD_FILE); \
 		$(INSTALL) -m 644 startup/$(SRC_INETD) $(INETD_DIR)/$(INETD_FILE); \
 		if test $(INETD_TYPE) = systemd; then \
-			SRC_INETD_FILE=`echo "$SRC_INETD_FILE" | sed -e 's/socket$/socket-svc/'`; \
-			$(INSTALL) -m 644 startup/$(SRC_INETD) $(INETD_DIR)/$(INETD_FILE); \
-			INETD_FILE=`echo "$INETD_FILE" | sed -e 's/socket$/service/'`; \
-			$(INSTALL) -m 644 startup/$(SRC_INETD) $(INETD_DIR)/$(INETD_FILE); \
+			SRC_INETD_FILE=`echo "$SRC_INETD" | sed -e 's/socket/socket-svc/'`; \
+			echo $(INSTALL) -m 644 startup/$$SRC_INETD_FILE $(INETD_DIR)/$(INETD_FILE); \
+			$(INSTALL) -m 644 startup/$$SRC_INETD_FILE $(INETD_DIR)/$(INETD_FILE); \
 		fi; \
 	fi
 	@grep -E -q "^nrpe[\t ]+5666/tcp" /etc/services || \

build-aux/ax_nagios_get_files

@@ -60,7 +60,7 @@ AS_CASE([$init_type],
 		fi,
 
 	[systemd],
-		src_tmpfile=tmpfile.conf.in
+		src_tmpfile=tmpfile.conf
 		src_init=default-service,
 
 	[bsd],

build-aux/ax_nagios_get_paths

@@ -603,6 +603,7 @@ eval pkglocalstatedir=$pkglocalstatedir
 eval webdir=$webdir
 eval localedir=$localedir
 eval pkgsysconfdir=$pkgsysconfdir
+eval piddir=$piddir
 
 #
 # Init scripts/files

configure

@@ -3677,6 +3677,7 @@ eval pkglocalstatedir=$pkglocalstatedir
 eval webdir=$webdir
 eval localedir=$localedir
 eval pkgsysconfdir=$pkgsysconfdir
+eval piddir=$piddir
 
 #
 # Init scripts/files
@@ -3799,7 +3800,7 @@ case $init_type in #(
 			src_init=default-init
 		fi ;; #(
   systemd) :
-    src_tmpfile=tmpfile.conf.in
+    src_tmpfile=tmpfile.conf
 		src_init=default-service ;; #(
   bsd) :
     src_init=bsd-init ;; #(

src/Makefile.in

@@ -79,8 +79,8 @@ install-daemon: install-uninstall
 		$(INSTALL) -m 755 $(NRPE_INSTALL_OPTS) -d $(PIDDIR); \
 	fi
 	@if test "$(TMPFILESDIR)" != "N/A" ; then \
-		echo $(INSTALL) -m 644 startup/$(SRC_TMPFILE) $(TMPFILESDIR)/nrpe; \
-		$(INSTALL) -m 644 startup/$(SRC_TMPFILE) $(TMPFILESDIR)/nrpe; \
+		echo $(INSTALL) -m 644 ../startup/$(SRC_TMPFILE) $(TMPFILESDIR); \
+		$(INSTALL) -m 644 ../startup/$(SRC_TMPFILE) $(TMPFILESDIR); \
 	fi
 
 install-uninstall: