Replace cd with -C in recursive make recipes to allow multiple targets. Create directories for init and config files. --- This is an additional patch to be applied to nrpe source. Makefile.in | 48 ++++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/Makefile.in b/Makefile.in index 989d914..34726e1 100644 --- a/Makefile.in +++ b/Makefile.in @@ -46,7 +46,7 @@ SRC_INIT=@src_init@ all: - cd $(SRC_BASE); $(MAKE) + $(MAKE) -C $(SRC_BASE) @echo "";\ echo "*** Compile finished ***";\ @@ -58,19 +58,19 @@ all: echo "" nrpe: - cd $(SRC_BASE); $(MAKE) + $(MAKE) -C $(SRC_BASE) check_nrpe: - cd $(SRC_BASE); $(MAKE) + $(MAKE) -C $(SRC_BASE) install-plugin: - cd $(SRC_BASE); $(MAKE) $@ + $(MAKE) -C $(SRC_BASE) $@ install-daemon: - cd $(SRC_BASE); $(MAKE) $@ + $(MAKE) -C $(SRC_BASE) $@ install: - cd $(SRC_BASE); $(MAKE) $@ + $(MAKE) -C $(SRC_BASE) $@ install-init: @if test $(SRC_INIT) = unknown; then \ @@ -78,28 +78,28 @@ install-init: exit 1; \ fi @if test $(INIT_TYPE) = upstart; then\ - echo $(INSTALL) -m 644 startup/$(SRC_INIT) $(INIT_DIR)/$(INIT_FILE); \ - $(INSTALL) -m 644 startup/$(SRC_INIT) $(INIT_DIR)/$(INIT_FILE); \ + echo $(INSTALL) -D -m 644 startup/$(SRC_INIT) $(INIT_DIR)/$(INIT_FILE); \ + $(INSTALL) -D -m 644 startup/$(SRC_INIT) $(INIT_DIR)/$(INIT_FILE); \ echo initctl reload-configuration; \ initctl reload-configuration; \ elif test $(INIT_TYPE) = systemd; then\ - echo $(INSTALL) -m 644 startup/$(SRC_INIT) $(INIT_DIR)/$(INIT_FILE); \ - $(INSTALL) -m 644 startup/$(SRC_INIT) $(INIT_DIR)/$(INIT_FILE); \ + echo $(INSTALL) -D -m 644 startup/$(SRC_INIT) $(INIT_DIR)/$(INIT_FILE); \ + $(INSTALL) -D -m 644 startup/$(SRC_INIT) $(INIT_DIR)/$(INIT_FILE); \ elif test $(INIT_TYPE) = smf10 -o $(INIT_TYPE) = smf11; then \ echo $(INSTALL) -m 775 -g sys -d $(INIT_DIR);\ $(INSTALL) -m 775 -g sys -d $(INIT_DIR);\ - echo $(INSTALL) -m 644 startup/$(SRC_INIT) $(INIT_DIR)/$(INIT_FILE); \ - $(INSTALL) -m 644 startup/$(SRC_INIT) $(INIT_DIR)/$(INIT_FILE); \ + echo $(INSTALL) -D -m 644 startup/$(SRC_INIT) $(INIT_DIR)/$(INIT_FILE); \ + $(INSTALL) -D -m 644 startup/$(SRC_INIT) $(INIT_DIR)/$(INIT_FILE); \ echo svccfg import $(INIT_DIR)/$(INIT_FILE); \ svccfg import $(INIT_DIR)/$(INIT_FILE); \ echo "*** Run 'svcadm enable nrpe' to start it"; \ elif test $(INIT_TYPE) = gentoo; then\ - $(INSTALL) -m 755 startup/$(SRC_INIT) $(INIT_DIR)/$(INIT_FILE); \ + $(INSTALL) -D -m 755 startup/$(SRC_INIT) $(INIT_DIR)/$(INIT_FILE); \ echo rc-update add nrpe default; \ rc-update add nrpe default; \ else\ - echo $(INSTALL) -m 755 startup/$(SRC_INIT) $(INIT_DIR)/$(INIT_FILE); \ - $(INSTALL) -m 755 startup/$(SRC_INIT) $(INIT_DIR)/$(INIT_FILE); \ + echo $(INSTALL) -D -m 755 startup/$(SRC_INIT) $(INIT_DIR)/$(INIT_FILE); \ + $(INSTALL) -D -m 755 startup/$(SRC_INIT) $(INIT_DIR)/$(INIT_FILE); \ if test $(INIT_TYPE) = newbsd; then\ if test $(DIST) = openbsd; then\ echo "# nrpe@bsd_enable@=NO" >> /etc/rc.conf;\ @@ -132,23 +132,23 @@ install-inetd: cat startup/$(SRC_INETD) >> $(INETD_DIR)/$(INETD_FILE); \ elif 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)/$(INIT_FILE); \ - $(INSTALL) -m 644 startup/$$SRC_INETD_FILE $(INETD_DIR)/$(INIT_FILE); \ + echo $(INSTALL) -D -m 644 startup/$$SRC_INETD_FILE $(INETD_DIR)/$(INIT_FILE); \ + $(INSTALL) -D -m 644 startup/$$SRC_INETD_FILE $(INETD_DIR)/$(INIT_FILE); \ elif test $(INETD_TYPE) = smf10 -o $(INETD_TYPE) = smf11; then \ echo $(INSTALL) -m 775 -g sys -d $(INETD_DIR);\ $(INSTALL) -m 775 -g sys -d $(INETD_DIR);\ - echo $(INSTALL) -m 644 startup/$(SRC_INETD) $(INETD_DIR)/$(INETD_FILE); \ - $(INSTALL) -m 644 startup/$(SRC_INETD) $(INETD_DIR)/$(INETD_FILE); \ + echo $(INSTALL) -D -m 644 startup/$(SRC_INETD) $(INETD_DIR)/$(INETD_FILE); \ + $(INSTALL) -D -m 644 startup/$(SRC_INETD) $(INETD_DIR)/$(INETD_FILE); \ $(INSTALL) -m 775 -d $(INETD_DIR);\ echo svccfg import $(INETD_DIR)/$(INETD_FILE); \ svccfg import $(INETD_DIR)/$(INETD_FILE); \ echo "*** Run 'svcadm enable nrpe' to start it"; \ elif test $(INIT_TYPE) = launchd; then\ - $(INSTALL) -m 644 startup/$(SRC_INETD) $(INETD_DIR)/$(INETD_FILE); \ + $(INSTALL) -D -m 644 startup/$(SRC_INETD) $(INETD_DIR)/$(INETD_FILE); \ launchctl load $(INETD_DIR)/$(INETD_FILE); \ else\ - echo $(INSTALL) -m 644 startup/$(SRC_INETD) $(INETD_DIR)/$(INETD_FILE); \ - $(INSTALL) -m 644 startup/$(SRC_INETD) $(INETD_DIR)/$(INETD_FILE); \ + echo $(INSTALL) -D -m 644 startup/$(SRC_INETD) $(INETD_DIR)/$(INETD_FILE); \ + $(INSTALL) -D -m 644 startup/$(SRC_INETD) $(INETD_DIR)/$(INETD_FILE); \ fi @$(EGREP) -q "^nrpe[\t ]+@nrpe_port@/tcp" /etc/services || \ echo "***** MAKE SURE 'nrpe @nrpe_port@/tcp' IS IN YOUR /etc/services FILE" @@ -164,12 +164,12 @@ install-groups-users: fi clean: - cd $(SRC_BASE); $(MAKE) $@; cd .. + $(MAKE) -C $(SRC_BASE) $@ rm -f core rm -f *~ */*~ distclean: clean - cd $(SRC_BASE); $(MAKE) $@; cd .. + $(MAKE) -C $(SRC_BASE) $@ rm -rf autom4te.cache rm -f config.log config.status config.cache sample-config/nrpe.cfg $(SRC_INCLUDE)/config.h rm -f startup/bsd-init startup/debian-init startup/default-init startup/default-inetd -- 2.15.1