wok diff nagios/stuff/nagios-Makefiles.u @ rev 25039

Up aspell-pl (6.0_20210731-0), icmptx (20190501)
author Pascal Bellard <pascal.bellard@slitaz.org>
date Thu May 26 14:53:15 2022 +0000 (2022-05-26)
parents 753911d96458
children
line diff
     1.1 --- a/nagios/stuff/nagios-Makefiles.u	Wed Jun 13 10:34:15 2018 +0200
     1.2 +++ b/nagios/stuff/nagios-Makefiles.u	Thu May 26 14:53:15 2022 +0000
     1.3 @@ -1,29 +1,29 @@
     1.4 ---- nagios-3.2.1-ori/Makefile.in	Thu Dec 31 11:12:08 2009
     1.5 -+++ nagios-3.2.1/Makefile.in	Sun Jun  6 11:03:32 2010
     1.6 -@@ -30,8 +30,8 @@
     1.7 - LIBEXECDIR=@libexecdir@
     1.8 - HTMLDIR=@datarootdir@
     1.9 +--- nagios-4.4.6/Makefile.in	2020-04-28 20:48:29.000000000 +0000
    1.10 ++++ nagios-4.4.6/Makefile.in	2020-06-16 19:47:15.758584432 +0000
    1.11 +@@ -35,8 +35,8 @@
    1.12 + datarootdir=@datarootdir@
    1.13 + LN_S=@LN_S@
    1.14   INSTALL=@INSTALL@
    1.15  -INSTALL_OPTS=@INSTALL_OPTS@
    1.16  -COMMAND_OPTS=@COMMAND_OPTS@
    1.17  +INSTALL_OPTS=
    1.18  +COMMAND_OPTS=
    1.19   HTTPD_CONF=@HTTPD_CONF@
    1.20 - INIT_DIR=@init_dir@
    1.21 - INIT_OPTS=-o root -g root
    1.22 -@@ -264,6 +264,7 @@
    1.23 - 	@echo ""
    1.24 + LN_HTTPD_SITES_ENABLED=@LN_HTTPD_SITES_ENABLED@
    1.25 + INIT_DIR=@initdir@
    1.26 +@@ -337,6 +337,7 @@
    1.27 + 	@autoconf-macros/add_group_user $(DIST) $(NAGIOS_USER) $(NAGIOS_GRP) 1
    1.28   
    1.29   install-webconf:
    1.30  +	$(INSTALL) -m 755 -d $(DESTDIR)$(HTTPD_CONF)
    1.31   	$(INSTALL) -m 644 sample-config/httpd.conf $(DESTDIR)$(HTTPD_CONF)/nagios.conf
    1.32 - 
    1.33 - 	@echo ""
    1.34 ---- nagios-3.2.1-ori/base/Makefile.in	Wed Jun 17 05:57:21 2009
    1.35 -+++ nagios-3.2.1/base/Makefile.in	Sun Jun  6 11:03:32 2010
    1.36 + 	if [ $(LN_HTTPD_SITES_ENABLED) -eq 1 ]; then \
    1.37 + 		$(LN_S) $(DESTDIR)$(HTTPD_CONF)/nagios.conf $(DESTDIR)/etc/apache2/sites-enabled/nagios.conf; \
    1.38 +--- nagios-4.4.6/base/Makefile.in	2020-04-28 20:48:29.000000000 +0000
    1.39 ++++ nagios-4.4.6/base/Makefile.in	2020-06-16 19:47:15.758584432 +0000
    1.40  @@ -39,8 +39,8 @@
    1.41 - CGIDIR=@sbindir@
    1.42 - HTMLDIR=@datarootdir@
    1.43 + CGIDIR=@cgibindir@
    1.44 + HTMLDIR=@webdir@
    1.45   INSTALL=@INSTALL@
    1.46  -INSTALL_OPTS=@INSTALL_OPTS@
    1.47  -COMMAND_OPTS=@COMMAND_OPTS@
    1.48 @@ -32,11 +32,11 @@
    1.49   STRIP=@STRIP@
    1.50   
    1.51   CGIURL=@cgiurl@
    1.52 ---- nagios-3.2.1-ori/cgi/Makefile.in	Wed Jun 17 05:57:21 2009
    1.53 -+++ nagios-3.2.1/cgi/Makefile.in	Sun Jun  6 11:03:32 2010
    1.54 +--- nagios-4.4.6/cgi/Makefile.in	2020-04-28 20:48:29.000000000 +0000
    1.55 ++++ nagios-4.4.6/cgi/Makefile.in	2020-06-16 19:47:15.758584432 +0000
    1.56  @@ -18,8 +18,8 @@
    1.57 - CGIDIR=@sbindir@
    1.58 - HTMLDIR=@datarootdir@
    1.59 + CGIDIR=@cgibindir@
    1.60 + HTMLDIR=@webdir@
    1.61   INSTALL=@INSTALL@
    1.62  -INSTALL_OPTS=@INSTALL_OPTS@
    1.63  -COMMAND_OPTS=@COMMAND_OPTS@
    1.64 @@ -45,11 +45,11 @@
    1.65   STRIP=@STRIP@
    1.66   
    1.67   CGIEXTRAS=@CGIEXTRAS@
    1.68 ---- nagios-3.2.1-ori/common/Makefile.in	Wed Jun 17 05:57:21 2009
    1.69 -+++ nagios-3.2.1/common/Makefile.in	Sun Jun  6 11:03:32 2010
    1.70 -@@ -20,8 +20,8 @@
    1.71 - CGIDIR=@sbindir@
    1.72 - HTMLDIR=@datarootdir@
    1.73 +--- nagios-4.4.6/common/Makefile.in	2020-04-28 20:48:29.000000000 +0000
    1.74 ++++ nagios-4.4.6/common/Makefile.in	2020-06-16 19:47:15.762584477 +0000
    1.75 +@@ -19,8 +19,8 @@
    1.76 + CGIDIR=@cgibindir@
    1.77 + HTMLDIR=@webdir@
    1.78   INSTALL=@INSTALL@
    1.79  -INSTALL_OPTS=@INSTALL_OPTS@
    1.80  -COMMAND_OPTS=@COMMAND_OPTS@
    1.81 @@ -58,9 +58,9 @@
    1.82   
    1.83   CP=@CP@
    1.84   
    1.85 ---- nagios-3.2.1-ori/contrib/Makefile.in	Mon May 19 20:01:58 2008
    1.86 -+++ nagios-3.2.1/contrib/Makefile.in	Sun Jun  6 10:43:34 2010
    1.87 -@@ -15,7 +15,7 @@
    1.88 +--- nagios-4.4.6/contrib/Makefile.in	2020-04-28 20:48:29.000000000 +0000
    1.89 ++++ nagios-4.4.6/contrib/Makefile.in	2020-06-16 19:47:15.762584477 +0000
    1.90 +@@ -17,7 +17,7 @@
    1.91   # Generated automatically from configure script
    1.92   SNPRINTF_O=@SNPRINTF_O@
    1.93   INSTALL=@INSTALL@
    1.94 @@ -69,11 +69,11 @@
    1.95   
    1.96   
    1.97   prefix=@prefix@
    1.98 ---- nagios-3.2.1-ori/html/Makefile.in	Wed Jul  8 00:34:51 2009
    1.99 -+++ nagios-3.2.1/html/Makefile.in	Sun Jun  6 10:59:50 2010
   1.100 -@@ -10,8 +10,8 @@
   1.101 - CGIDIR=@sbindir@
   1.102 - HTMLDIR=@datadir@
   1.103 +--- nagios-4.4.6/html/Makefile.in	2020-04-28 20:48:29.000000000 +0000
   1.104 ++++ nagios-4.4.6/html/Makefile.in	2020-06-16 19:47:15.762584477 +0000
   1.105 +@@ -11,8 +11,8 @@
   1.106 + HTMLDIR=@webdir@
   1.107 + datarootdir=@datarootdir@
   1.108   INSTALL=@INSTALL@
   1.109  -INSTALL_OPTS=@INSTALL_OPTS@
   1.110  -COMMAND_OPTS=@COMMAND_OPTS@
   1.111 @@ -82,9 +82,9 @@
   1.112   
   1.113   CP=@CP@
   1.114   
   1.115 ---- nagios-3.2.1-ori/module/Makefile.in	Sat Dec 15 00:02:24 2007
   1.116 -+++ nagios-3.2.1/module/Makefile.in	Sun Jun  6 11:03:32 2010
   1.117 -@@ -19,9 +19,8 @@
   1.118 +--- nagios-4.4.6/module/Makefile.in	2020-04-28 20:48:29.000000000 +0000
   1.119 ++++ nagios-4.4.6/module/Makefile.in	2020-06-16 19:47:15.762584477 +0000
   1.120 +@@ -18,9 +18,8 @@
   1.121   exec_prefix=@exec_prefix@
   1.122   BINDIR=@bindir@
   1.123   INSTALL=@INSTALL@