$NetBSD: patch-Makefile.in,v 1.4 2023/01/08 23:33:59 sekiya Exp $ Adjustments to build procedure. --- Makefile.in.orig 2022-11-17 05:52:51.000000000 +0900 +++ Makefile.in 2023-01-09 07:31:28.044621790 +0900 @@ -25,7 +25,7 @@ exec_prefix=@exec_prefix@ LOGDIR=@localstatedir@ CHECKRESULTDIR=@CHECKRESULTDIR@ -CFGDIR=@sysconfdir@ +SAMPDIR=@prefix@/share/examples/nagios BINDIR=@bindir@ CGIDIR=@cgibindir@ LIBEXECDIR=@libexecdir@ @@ -37,7 +37,6 @@ INSTALL=@INSTALL@ INSTALL_OPTS=@INSTALL_OPTS@ COMMAND_OPTS=@COMMAND_OPTS@ -HTTPD_CONF=@HTTPD_CONF@ LN_HTTPD_SITES_ENABLED=@LN_HTTPD_SITES_ENABLED@ INIT_DIR=@initdir@ INIT_OPTS=@INIT_OPTS@ @@ -88,85 +87,6 @@ cd $(SRC_BASE) && $(MAKE) cd $(SRC_CGI) && $(MAKE) cd $(SRC_HTM) && $(MAKE) - if [ x$(USE_EVENTBROKER) = xyes ]; then \ - cd $(SRC_MODULE) && $(MAKE); \ - fi - cd $(SRC_WORKERS) && $(MAKE) $@ - - @echo "" - @echo "*** Compile finished ***" - @echo "" - @echo "If the main program and CGIs compiled without any errors, you" - @echo "can continue with testing or installing Nagios as follows (type" - @echo "'make' without any arguments for a list of all possible options):" - @echo "" - @echo " make test" - @echo " - This runs the test suite" - @echo "" - @echo " make install" - @echo " - This installs the main program, CGIs, and HTML files" - @echo "" - @echo " make install-init" - @echo " - This installs the init script in $(DESTDIR)$(INIT_DIR)" - @echo "" - @echo " make install-daemoninit" - @echo " - This will initialize the init script" - @echo " in $(DESTDIR)$(INIT_DIR)" - @echo "" - @echo " make install-groups-users" - @echo " - This adds the users and groups if they do not exist" - @echo "" - @echo " make install-commandmode" - @echo " - This installs and configures permissions on the" - @echo " directory for holding the external command file" - @echo "" - @echo " make install-config" - @echo " - This installs *SAMPLE* config files in $(DESTDIR)$(CFGDIR)" - @echo " You'll have to modify these sample files before you can" - @echo " use Nagios. Read the HTML documentation for more info" - @echo " on doing this. Pay particular attention to the docs on" - @echo " object configuration files, as they determine what/how" - @echo " things get monitored!" - @echo "" - @echo " make install-webconf" - @echo " - This installs the Apache config file for the Nagios" - @echo " web interface" - @echo "" - @echo " make install-exfoliation" - @echo " - This installs the Exfoliation theme for the Nagios" - @echo " web interface" - @echo "" - @echo " make install-classicui" - @echo " - This installs the classic theme for the Nagios" - @echo " web interface" - @echo "" - @echo "" - @echo "*** Support Notes *******************************************" - @echo "" - @echo "If you have questions about configuring or running Nagios," - @echo "please make sure that you:" - @echo "" - @echo " - Look at the sample config files" - @echo " - Read the documentation on the Nagios Library at:" - @echo " https://library.nagios.com" - @echo "" - @echo "before you post a question to one of the mailing lists." - @echo "Also make sure to include pertinent information that could" - @echo "help others help you. This might include:" - @echo "" - @echo " - What version of Nagios you are using" - @echo " - What version of the plugins you are using" - @echo " - Relevant snippets from your config files" - @echo " - Relevant error messages from the Nagios log file" - @echo "" - @echo "For more information on obtaining support for Nagios, visit:" - @echo "" - @echo " https://support.nagios.com" - @echo "" - @echo "*************************************************************" - @echo "" - @echo "Enjoy." - @echo "" $(SRC_LIB)/libnagios.a: cd $(SRC_LIB) && $(MAKE) @@ -287,11 +207,6 @@ $(MAKE) install-basic install-basic: - $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(LIBEXECDIR) - $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(LOGDIR) - $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(LOGDIR)/archives - $(INSTALL) -m 775 $(COMMAND_OPTS) -d $(DESTDIR)$(CHECKRESULTDIR) - chmod g+s $(DESTDIR)$(CHECKRESULTDIR) @echo "" @echo "*** Main program, CGIs and HTML files installed ***" @@ -311,19 +226,19 @@ @echo "" install-config: - $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(CFGDIR) - $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(CFGDIR)/objects - $(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/nagios.cfg $(DESTDIR)$(CFGDIR)/nagios.cfg - $(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/cgi.cfg $(DESTDIR)$(CFGDIR)/cgi.cfg - $(INSTALL) -b -m 660 $(INSTALL_OPTS) sample-config/resource.cfg $(DESTDIR)$(CFGDIR)/resource.cfg - $(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/template-object/templates.cfg $(DESTDIR)$(CFGDIR)/objects/templates.cfg - $(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/template-object/commands.cfg $(DESTDIR)$(CFGDIR)/objects/commands.cfg - $(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/template-object/contacts.cfg $(DESTDIR)$(CFGDIR)/objects/contacts.cfg - $(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/template-object/timeperiods.cfg $(DESTDIR)$(CFGDIR)/objects/timeperiods.cfg - $(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/template-object/localhost.cfg $(DESTDIR)$(CFGDIR)/objects/localhost.cfg - $(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/template-object/windows.cfg $(DESTDIR)$(CFGDIR)/objects/windows.cfg - $(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/template-object/printer.cfg $(DESTDIR)$(CFGDIR)/objects/printer.cfg - $(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/template-object/switch.cfg $(DESTDIR)$(CFGDIR)/objects/switch.cfg + [ -d $(DESTDIR)$(SAMPDIR) ] || ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(SAMPDIR) + [ -d $(DESTDIR)$(SAMPDIR)/objects ] || ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(SAMPDIR)/objects + ${BSD_INSTALL_DATA} -m 644 sample-config/nagios.cfg $(DESTDIR)$(SAMPDIR)/nagios.cfg-sample + ${BSD_INSTALL_DATA} -m 644 sample-config/cgi.cfg $(DESTDIR)$(SAMPDIR)/cgi.cfg-sample + ${BSD_INSTALL_DATA} -m 640 sample-config/resource.cfg $(DESTDIR)$(SAMPDIR)/resource.cfg-sample + ${BSD_INSTALL_DATA} -m 644 sample-config/template-object/templates.cfg $(DESTDIR)$(SAMPDIR)/objects/templates.cfg-sample + ${BSD_INSTALL_DATA} -m 644 sample-config/template-object/commands.cfg $(DESTDIR)$(SAMPDIR)/objects/commands.cfg-sample + ${BSD_INSTALL_DATA} -m 644 sample-config/template-object/contacts.cfg $(DESTDIR)$(SAMPDIR)/objects/contacts.cfg-sample + ${BSD_INSTALL_DATA} -m 644 sample-config/template-object/timeperiods.cfg $(DESTDIR)$(SAMPDIR)/objects/timeperiods.cfg-sample + ${BSD_INSTALL_DATA} -m 644 sample-config/template-object/localhost.cfg $(DESTDIR)$(SAMPDIR)/objects/localhost.cfg-sample + ${BSD_INSTALL_DATA} -m 644 sample-config/template-object/windows.cfg $(DESTDIR)$(SAMPDIR)/objects/windows.cfg-sample + ${BSD_INSTALL_DATA} -m 644 sample-config/template-object/printer.cfg $(DESTDIR)$(SAMPDIR)/objects/printer.cfg-sample + ${BSD_INSTALL_DATA} -m 644 sample-config/template-object/switch.cfg $(DESTDIR)$(SAMPDIR)/objects/switch.cfg-sample @echo "" @echo "*** Config files installed ***" @@ -348,13 +263,13 @@ install-exfoliation: @cd contrib/exfoliation; \ - $(INSTALL) $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/stylesheets; \ + $(BSD_INSTALL_DATA_DIR) -d $(DESTDIR)$(HTMLDIR)/stylesheets; \ for file in $$(find ./stylesheets/ -type f); do \ - $(INSTALL) -m 644 $(INSTALL_OPTS) $${file} $(DESTDIR)$(HTMLDIR)/$${file}; \ + $(BSD_INSTALL_DATA) $${file} $(DESTDIR)$(HTMLDIR)/$${file}; \ done; \ - $(INSTALL) $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/images; \ + $(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(HTMLDIR)/images; \ for file in $$(find ./images -type f); do \ - $(INSTALL) -m 644 $(INSTALL_OPTS) $${file} $(DESTDIR)$(HTMLDIR)/$${file}; \ + $(BSD_INSTALL_DATA) $${file} $(DESTDIR)$(HTMLDIR)/$${file}; \ done; \ cd ../.. @@ -413,7 +328,10 @@ install-commandmode: - $(INSTALL) -m 775 $(COMMAND_OPTS) -d $(DESTDIR)$(LOGDIR)/rw + ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(LOGDIR)/archives + ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(LOGDIR)/rw + ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(CHECKRESULTDIR) + chmod g+s $(DESTDIR)$(LOGDIR)/archives chmod g+s $(DESTDIR)$(LOGDIR)/rw @echo ""