Title: [opsview-base] [142] Don?\226?\128?\153t install Nagios?\226?\128?\153 web images.
- Revision
- 142
- Author
- pknight
- Date
- 2012-12-04 16:59:30 +0000 (Tue, 04 Dec 2012)
Log Message
Don?\226?\128?\153t install Nagios?\226?\128?\153 web images.
Modified Paths
Added Paths
Modified: trunk/Makefile
===================================================================
--- trunk/Makefile 2012-12-03 16:32:03 UTC (rev 141)
+++ trunk/Makefile 2012-12-04 16:59:30 UTC (rev 142)
@@ -552,6 +552,7 @@
# cd ${NAGIOS} && patch -p1 < ../patches/nagios_addack_info_on_statechange.patch
# cd ${NAGIOS} && patch -p1 < ../patches/nagios_cgi_add_infobox.patch
cd ${NAGIOS} && patch -p1 < ../patches/nagios_contactgrouplist_macro.patch
+ cd ${NAGIOS} && patch -p1 < ../patches/nagios_no_web_images.patch
if [ $(KERNEL_NAME) = Linux ] ; then \
cd ${NAGIOS} && CFLAGS="${CFLAGS}" ./configure --with-nagios-user=$(NAGIOS_USER) --with-nagios-group=$(NAGIOS_GROUP) --with-command-group=$(NAGIOS_GROUP) --with-cgiurl=/cgi-bin --with-htmurl=/ --enable-libtap ; \
elif [ $(KERNEL_NAME) = Darwin ] ; then \
Added: trunk/patches/nagios_no_web_images.patch
===================================================================
--- trunk/patches/nagios_no_web_images.patch (rev 0)
+++ trunk/patches/nagios_no_web_images.patch 2012-12-04 16:59:30 UTC (rev 142)
@@ -0,0 +1,32 @@
+diff -Bbur nagios-4.0.20121116.orig/html/Makefile.in nagios-4.0.20121116/html/Makefile.in
+--- nagios-4.0.20121116.orig/html/Makefile.in 2012-12-04 16:44:56.000000000 +0000
++++ nagios-4.0.20121116/html/Makefile.in 2012-12-04 16:56:08.000000000 +0000
+@@ -42,8 +42,6 @@
+ $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/docs
+ $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/docs/images
+ $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/js
+- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/images
+- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/images/logos
+ $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/includes
+ $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/includes/rss
+ $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/includes/rss/extlib
+@@ -77,8 +75,6 @@
+ # do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images; done
+ # for file in images/*.ico; \
+ # do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images; done
+- for file in images/logos/*.*; \
+- do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images/logos; done
+ for file in includes/*.*; \
+ do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/includes; done
+ for file in includes/rss/*.*; \
+diff -Bbur nagios-4.0.20121116.orig/Makefile.in nagios-4.0.20121116/Makefile.in
+--- nagios-4.0.20121116.orig/Makefile.in 2012-12-04 16:44:56.000000000 +0000
++++ nagios-4.0.20121116/Makefile.in 2012-12-04 16:56:09.000000000 +0000
+@@ -292,7 +292,6 @@
+
+ install-exfoliation:
+ cp -rf contrib/exfoliation/stylesheets/* $(DESTDIR)$(HTMLDIR)/stylesheets
+- cp -rf contrib/exfoliation/images/* $(DESTDIR)$(HTMLDIR)/images
+
+ @echo ""
+ @echo "*** Exfoliation theme installed ***"
_______________________________________________
Opsview-checkins mailing list
[email protected]
http://lists.opsview.org/lists/listinfo/opsview-checkins
