[icinga-checkins] icinga.org: icinga-web/master: New config option --with-clearcache path

git at icinga.org git at icinga.org
Mon Apr 30 16:41:02 CEST 2012


Module: icinga-web
Branch: master
Commit: 4e8c5e19626e9555cf48111547b72b3a49e83a8b
URL:    https://git.icinga.org/?p=icinga-web.git;a=commit;h=4e8c5e19626e9555cf48111547b72b3a49e83a8b

Author: Marius Hein <marius.hein at netways.de>
Date:   Mon Apr 30 16:39:44 2012 +0200

New config option --with-clearcache path

Enables option to install clearcache script into any directory
you want (fixes #2383)

---

 bin/Makefile.in |   11 ++++++++---
 configure       |   15 +++++++++++++++
 configure.ac    |    7 +++++++
 3 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/bin/Makefile.in b/bin/Makefile.in
index 1b80ba9..8eef5b9 100644
--- a/bin/Makefile.in
+++ b/bin/Makefile.in
@@ -5,16 +5,21 @@ CFGDIR=@sysconfdir@
 BINDIR=@bindir@
 CGIDIR=@sbindir@
 HTMLDIR=@datarootdir@
-
+CLEARCACHE_BIN_PATH=@clearcache_bin_path@
 INSTALL=@INSTALL@
 INSTALL_OPTS=@INSTALL_OPTS@
 
-install: installdirs
-	@files=`find . -mindepth 1 -type f ! -name "*.in" -and ! -name "Makefile"`; \
+install: installdirs install-clearcache
+	@files=`find . -mindepth 1 -type f ! -name "*.in" \
+    -and ! -name "Makefile" -and ! -name "clearcache.sh"`; \
 	for file in $$files; do \
 		$(INSTALL) -m 775 $(INSTALL_OPTS) "$$file" $(DESTDIR)$(prefix)/bin/"$$file"; \
 	done
 
+install-clearcache:
+	$(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(CLEARCACHE_BIN_PATH)
+	$(INSTALL) -m 775 $(INSTALL_OPTS) "clearcache.sh" "$(DESTDIR)$(CLEARCACHE_BIN_PATH)/clearcache.sh"
+
 installdirs:
 	$(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(prefix)/bin
 	@dirs=`find . -mindepth 1 -type d`; \
diff --git a/configure b/configure
index a0ee9de..6f3b892 100755
--- a/configure
+++ b/configure
@@ -604,6 +604,7 @@ db_host
 db_type
 bin_group
 bin_user
+clearcache_bin_path
 web_apache_path
 web_absolute_path
 web_path
@@ -673,6 +674,7 @@ with_web_group
 with_web_path
 with_web_absolute_path
 with_web_apache_path
+with_clearcache_path
 with_bin_user
 with_bin_group
 with_db_type
@@ -1330,6 +1332,8 @@ Optional Packages:
                           absolute path to pub (default %core.root_dir%/pub)
   --with-web-apache-path=PATH
                           Include folder apache2 (default /etc/apache2/conf.d
+  --with-clearcache-path=PATH
+                          Path to install the clearcache script
   --with-bin-user=USER    user for all other files (default root)
   --with-bin-group=GROUP  group for all other files (default bin)
   --with-db-type=DBTYPE   Type of dbms (default mysql)
@@ -2366,6 +2370,16 @@ fi
 
 
 
+# Check whether --with-clearcache_path was given.
+if test "${with_clearcache_path+set}" = set; then :
+  withval=$with_clearcache_path; clearcache_bin_path=$withval
+else
+  clearcache_bin_path=$prefix/bin
+
+fi
+
+
+
 # Check whether --with-bin_user was given.
 if test "${with_bin_user+set}" = set; then :
   withval=$with_bin_user; bin_user=$withval
@@ -2952,6 +2966,7 @@ fi
 
 
 
+
 ac_config_files="$ac_config_files Makefile lib/Makefile lib/icingaScheduler/config.php pub/Makefile etc/Makefile bin/Makefile doc/Makefile app/Makefile app/config.php app/config/databases.xml app/config/icinga.xml app/config/logging.xml app/config/settings.xml app/config/translation.xml app/config/factories.xml app/modules/Api/config/access.xml app/modules/Api/config/module.xml app/modules/AppKit/config/module.xml app/modules/AppKit/config/auth.xml app/modules/Config/config/module.xml app/modules/Reporting/config/module.xml app/modules/Web/config/module.xml etc/build.properties tests/phpunit/test.properties etc/apache2/icinga-web.conf etc/scheduler/icingaCron bin/clearcache.sh pub/.htaccess pub/soap/.htaccess etc/conf.d/access.xml etc/conf.d/databases.xml etc/conf.d/Makefile etc/conf.d/sla.xml"
 
 
diff --git a/configure.ac b/configure.ac
index 71ecef8..0db5a5e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -96,6 +96,12 @@ AC_ARG_WITH([web_apache_path],
     web_apache_path=ACICINGA_PATH_GUESS([/etc/httpd/conf.d /etc/apache2/conf.d /etc/apache/conf.d], [web_apache_path], [/etc/apache2/conf.d])
 )
 
+AC_ARG_WITH([clearcache_path],
+    AS_HELP_STRING([--with-clearcache-path=PATH], [Path to install the clearcache script]),
+    clearcache_bin_path=$withval,
+    clearcache_bin_path=$prefix/bin
+)
+
 AC_ARG_WITH([bin_user],
     AS_HELP_STRING([--with-bin-user=USER], [user for all other files (default root)]),
     bin_user=$withval,
@@ -326,6 +332,7 @@ AC_SUBST(web_group)
 AC_SUBST(web_path)
 AC_SUBST(web_absolute_path)
 AC_SUBST(web_apache_path)
+AC_SUBST(clearcache_bin_path)
 AC_SUBST(bin_user)
 AC_SUBST(bin_group)
 





More information about the icinga-checkins mailing list