[icinga-checkins] icinga.org: icinga-core/mfriedrich/clob: install: add ' make classicui-standalone' and 'make install-classicui-standalone'

git at icinga.org git at icinga.org
Tue Apr 16 09:36:22 CEST 2013


Module: icinga-core
Branch: mfriedrich/clob
Commit: 81884bebac69617d5a143cfcc452cb24a0fe19c2
URL:    https://git.icinga.org/?p=icinga-core.git;a=commit;h=81884bebac69617d5a143cfcc452cb24a0fe19c2

Author: Michael Friedrich <Michael.Friedrich at netways.de>
Date:   Sat Apr 13 15:05:54 2013 +0200

install: add 'make classicui-standalone' and 'make install-classicui-standalone'

refs #3963

---

 Changelog   |    4 ++++
 Makefile.in |   32 +++++++++++++++++++++++++++++---
 2 files changed, 33 insertions(+), 3 deletions(-)

diff --git a/Changelog b/Changelog
index 1b2574c..79366a1 100644
--- a/Changelog
+++ b/Changelog
@@ -47,6 +47,7 @@ ENHANCEMENTS
 * install: add lighttp config samples to contrib/lighttp #2253 - RB
 * install: add --with-httpd-conf-file to allow specific apache config to be installed #3962 - MF
 * install: make install-webconf should install htpasswd.users automatically, allowing default icingaadmin login out-of-the-box #3963 - MF
+* install: add 'make classicui-standalone' and 'make install-classicui-standalone' #3963 - MF
 
 * docs: Temporary files should mention temp_file option in icinga.cfg #3748 - WN
 
@@ -80,6 +81,7 @@ FIXES
 * install: fix broken configure ssl detection for idoutils on ubuntu/debian (Oliver Skibbe) #3413 - MF
 * install: fix ido2db initscript uses same chkconfig line as icinga (Dirk Götz) #3490 - MF
 * install: fix configure does not detect AIX6/7 properly #3895 - MF
+* install: fix STATEDIR creation during make install #3869 - MF
 
 * classic ui: fix cmd.cgi does not honor commandpipe location; overwrites from empty environment variable #3418 - MF
 * classic ui: fixed Double-listed host dependencies in host extinfo.cgi #3295 - RB
@@ -129,6 +131,8 @@ CHANGES
 	** can be invoked with install-webconf-auth standalone too
 * install: add --enable-classicui-standalone #3869
 	** sets cgi.cfg standalone_installation=1
+* install: add 'make classicui-standalone' and 'make install-classicui-standalone' #3963
+	** this will install classic ui standalone, if enabled
 
 
 1.8.4 - 13/01/2013
diff --git a/Makefile.in b/Makefile.in
index f1d5a10..ed929c6 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -55,6 +55,7 @@ INIT_DIR=@init_dir@
 INIT_OPTS=@INIT_OPTS@
 CGICFGDIR=$(CGIDIR)
 PERLDIR=@PERLDIR@
+STATEDIR=@STATEDIR@
 
 ###############################
 # Modules
@@ -100,10 +101,11 @@ none:
 
 	@printf "\nCompile targets:\n"
 	@printf "\t%-23s - %s\n" "icinga" "icinga core"
-	@printf "\t%-23s - %s\n" "cgis" "classical web"
+	@printf "\t%-23s - %s\n" "cgis" "classic ui"
 	@printf "\t%-23s - %s\n" "contrib" "contrib dir"
 	@printf "\t%-23s - %s\n" "modules" "icinga modules"
 	@printf "\t%-23s - %s\n" "idoutils" "icinga idoutils"
+	@printf "\t%-23s - %s\n" "classicui-standalone" "standalone classic ui"
 
 	@printf "\nInstall targets:\n"
 	@printf "\t%-23s - %s\n" "install" "install core, cgis, html"
@@ -118,6 +120,7 @@ none:
 	@printf "\t%-23s - %s\n" "install-eventhandlers" "install sample eventhandlers"
 	@printf "\t%-23s - %s\n" "install-dev-docu" "install doxygen development documentation"
 	@printf "\t%-23s - %s\n" "install-testconfig" "install test config"
+	@printf "\t%-23s - %s\n" "install-classicui-standalone" "install standalone classic ui"
 
 
 # FreeBSD make does not support -C option, so we'll use the Apache style... (patch by Stanley Hopcroft 12/27/1999)
@@ -233,6 +236,13 @@ contrib:
 modules:
 	cd $(SRC_MODULE) && $(MAKE)
 
+classicui-standalone: cgis
+
+	@echo ""
+	@echo "Standalone Classic UI CGIs built."
+	@echo "Proceed with 'make install-classicui-standalone'."
+	@echo ""
+
 ###############################
 # Clean
 ###############################
@@ -370,6 +380,7 @@ install-unstripped:
 	$(MAKE) install-basic
 
 install-basic:
+	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(STATEDIR)
 	$(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
@@ -411,6 +422,11 @@ install-basic:
 	@echo "    http://docs.icinga.org/latest/en/upgrading.html"
 	@echo ""
 
+install-cgiconf:
+	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(CFGDIR)
+	$(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/cgi.cfg $(DESTDIR)$(CFGDIR)/cgi.cfg
+	$(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/cgiauth.cfg $(DESTDIR)$(CFGDIR)/cgiauth.cfg
+
 
 install-config:
 	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(CFGDIR)
@@ -419,8 +435,6 @@ install-config:
 	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(CFGDIR)/modules
 	$(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/icinga.cfg $(DESTDIR)$(CFGDIR)/icinga.cfg
 	$(INSTALL) -b -m 660 $(INSTALL_OPTS) sample-config/resource.cfg $(DESTDIR)$(CFGDIR)/resource.cfg
-	$(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/cgi.cfg $(DESTDIR)$(CFGDIR)/cgi.cfg
-	$(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/cgiauth.cfg $(DESTDIR)$(CFGDIR)/cgiauth.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
@@ -530,6 +544,18 @@ install-eventhandlers:
 	@echo ""
 
 
+install-classicui-standalone: install-cgis install-html install-cgiconf install-webconf
+
+	# make sure we keep all the needed dirs for data
+	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(STATEDIR)
+	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(LOGDIR)
+	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(LOGDIR)/archives
+	$(INSTALL) -m 775 $(COMMAND_OPTS) -d $(DESTDIR)$(EXTCMDFILEDIR)
+
+	@echo ""
+	@echo "*** Icinga Classic UI Standalone installed ***"
+	@echo ""
+
 fullinstall:
 	@if [ x$(USE_IDOUTILS) = xyes ]; then \
 		${MAKE} install install-init install-commandmode install-webconf install-idoutils install-eventhandlers;\





More information about the icinga-checkins mailing list