From: Michael Friedrich <michael.friedrich@netways.de>
Date: Tue, 1 Oct 2013 17:28:16 +0000 (+0200)
Subject: config: Fix $(DESTDIR) support.
X-Git-Tag: v0.0.3~297
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=98032b2a71544cf9b889c68f9cbfd59f16cfe4cc;p=icinga2

config: Fix $(DESTDIR) support.
---

diff --git a/etc/icinga2/Makefile.am b/etc/icinga2/Makefile.am
index f3d2daadc..1a911c478 100644
--- a/etc/icinga2/Makefile.am
+++ b/etc/icinga2/Makefile.am
@@ -4,7 +4,7 @@ SUBDIRS = \
 	conf.d \
 	features-available
 
-icinga2confdir = $(sysconfdir)/icinga2
+icinga2confdir = $(DESTDIR)${sysconfdir}/icinga2
 
 CONFIG_FILES = \
 	icinga2.conf
diff --git a/etc/icinga2/conf.d/Makefile.am b/etc/icinga2/conf.d/Makefile.am
index 48e4c8ea4..81e219b82 100644
--- a/etc/icinga2/conf.d/Makefile.am
+++ b/etc/icinga2/conf.d/Makefile.am
@@ -1,14 +1,14 @@
 ## Process this file with automake to produce Makefile.in
 
-icinga2confdir = $(sysconfdir)/icinga2/conf.d
+icinga2confdir = $(DESTDIR)${sysconfdir}/icinga2/conf.d
 
 CONFIG_FILES = \
 	localhost.conf \
 	macros.conf
 
 install-data-local:
-	if [ ! -e $(icinga2confdir); ]; then \
-	  @$(MKDIR_P) $(icinga2confdir); \
+	@if [ ! -e $(icinga2confdir) ]; then \
+	  $(MKDIR_P) $(icinga2confdir); \
 	  for file in $(CONFIG_FILES); do \
 	    $(INSTALL_DATA) -o @icinga_user@ -g @icinga_group@ -m 0640 $(srcdir)/$$file $(icinga2confdir)/$$file; \
 	  done; \
diff --git a/etc/icinga2/features-available/Makefile.am b/etc/icinga2/features-available/Makefile.am
index c99341e3e..c40b43332 100644
--- a/etc/icinga2/features-available/Makefile.am
+++ b/etc/icinga2/features-available/Makefile.am
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 
-icinga2confdir = $(sysconfdir)/icinga2/features-available
+icinga2confdir = $(DESTDIR)${sysconfdir}/icinga2/features-available
 
 CONFIG_FILES = \
 	checker.conf \