[icinga-checkins] icinga.org: icinga-core/mfriedrich/core: add mkdir -p for HTTPDCONF directory creation instead of install -D ( misses on Unix) #802

git at icinga.org git at icinga.org
Thu Sep 23 09:01:26 CEST 2010


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

Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Thu Sep 23 09:00:36 2010 +0200

add mkdir -p for HTTPDCONF directory creation instead of install -D (misses on Unix) #802

fixes #802

---

 Changelog   |    1 +
 Makefile.in |    8 +++++++-
 THANKS      |    1 +
 3 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/Changelog b/Changelog
index 35dd6ac..21a9530 100644
--- a/Changelog
+++ b/Changelog
@@ -41,6 +41,7 @@ FIXES
 * idoutils: fix ido2db forking if database connection failed, now immediately disconnecting the client #773
 
 * install: remove php dependency and files for updatechecks/extended search in icinga.spec #800
+* install: add mkdir -p for HTTPDCONF directory creation instead of install -D (misses on Unix) #802
 
 
 1.0.3 - 18/08/2010
diff --git a/Makefile.in b/Makefile.in
index ac09f23..8178e62 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -67,6 +67,11 @@ CGIEXTRAS=@CGIEXTRAS@
 SNPRINTF_O=@SNPRINTF_O@
 
 ###############################
+# Tools
+###############################
+MKDIR=/bin/mkdir
+
+###############################
 # Global
 ###############################
 ICINGA_VERSION=1.0.3
@@ -424,7 +429,8 @@ install-config:
 	@echo ""
 
 install-webconf:
-	$(INSTALL) -D -m 644 sample-config/httpd.conf $(DESTDIR)$(HTTPD_CONF)/icinga.conf
+	$(MKDIR) -p -m 775 $(DESTDIR)$(HTTPD_CONF)
+	$(INSTALL) -m 644 sample-config/httpd.conf $(DESTDIR)$(HTTPD_CONF)/icinga.conf
 
 	@echo ""
 	@echo "*** Icinga/Apache conf file installed ***"
diff --git a/THANKS b/THANKS
index 05ec3d2..d8bb78a 100644
--- a/THANKS
+++ b/THANKS
@@ -87,6 +87,7 @@ in various ways.  If we missed your name, let us know.
 * Ari Edelkind
 * Matthias Eichler
 * Rob Enders
+* Lars Engels
 * Andreas Ericsson
 * Matt Ezell
 * Sylvain Falardeau





More information about the icinga-checkins mailing list