[icinga-checkins] icinga.org: icinga-core/mfriedrich/core: install: do not overwrite config in make fullinstall #1754

git at icinga.org git at icinga.org
Tue Jul 26 17:30:48 CEST 2011


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

Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Tue Jul 26 17:27:33 2011 +0200

install: do not overwrite config in make fullinstall #1754

fixes #1754

---

 Changelog   |    1 +
 Makefile.in |    6 ++++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/Changelog b/Changelog
index 621cfb8..4e031a8 100644
--- a/Changelog
+++ b/Changelog
@@ -58,6 +58,7 @@ FIXES
 * install: fix make install-idoutils overwrites sample - adding idoutils.cfg-sample instead #1625
 * install: fix icinga.cmd and log dir replacement in icinga-api aubmodule #1573 #1715
 * install: fix DEBUG_LOG_PATH in p1.pl, will now be using configurable log-dir #1715
+* install: do not overwrite config in make fullinstall #1754
 
 * config: deprecate log_external_commands_user #1619
 * config: tune icinga.cfg for performance, enable_environment_macros=0, enable_embedded_perl=0 by default #1635
diff --git a/Makefile.in b/Makefile.in
index 56ff3ac..de16afb 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -506,9 +506,11 @@ install-commandmode:
 
 fullinstall:
 	@if [ x$(USE_IDOUTILS) = xyes ]; then \
-		${MAKE} install install-init install-commandmode install-webconf install-config install-idoutils ;\
+		${MAKE} install install-init install-commandmode install-webconf install-idoutils ;\
+		echo "Run make install-config for installing/overwriting the configs..." ;\
         else \
-		${MAKE} install install-init install-commandmode install-webconf install-config ;\
+		${MAKE} install install-init install-commandmode install-webconf ;\
+		echo "Run make install-config for installing/overwriting the configs..." ;\
         fi
 
 # Uninstall is too destructive if base install directory is /usr, etc.





More information about the icinga-checkins mailing list