Browse Source

More minor fixes. systemd can be such a pain!

John C. Frickson 10 years ago
parent
commit
801c573b22
3 changed files with 5 additions and 3 deletions
  1. 3 3
      Makefile.in
  2. 1 0
      build-aux/ax_nagios_get_paths
  3. 1 0
      configure

+ 3 - 3
Makefile.in

@@ -90,9 +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" | 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); \
+			SRC_INETD_FILE=`echo "$(SRC_INETD)" | sed -e 's/socket/socket-svc/'`; \
+			echo $(INSTALL) -m 644 startup/$$SRC_INETD_FILE $(INETD_DIR)/$(INIT_FILE); \
+			$(INSTALL) -m 644 startup/$$SRC_INETD_FILE $(INETD_DIR)/$(INIT_FILE); \
 		fi; \
 	fi
 	@grep -E -q "^nrpe[\t ]+5666/tcp" /etc/services || \

+ 1 - 0
build-aux/ax_nagios_get_paths

@@ -602,6 +602,7 @@ eval cgibindir=$cgibindir
 eval pkglocalstatedir=$pkglocalstatedir
 eval webdir=$webdir
 eval localedir=$localedir
+eval sysconfdir=$sysconfdir
 eval pkgsysconfdir=$pkgsysconfdir
 eval piddir=$piddir
 

+ 1 - 0
configure

@@ -3676,6 +3676,7 @@ eval cgibindir=$cgibindir
 eval pkglocalstatedir=$pkglocalstatedir
 eval webdir=$webdir
 eval localedir=$localedir
+eval sysconfdir=$sysconfdir
 eval pkgsysconfdir=$pkgsysconfdir
 eval piddir=$piddir