config: Fix $(DESTDIR) support.

diff --git a/etc/icinga2/Makefile.am b/etc/icinga2/Makefile.am
index f3d2daadc98dc74ee8c5f666eb979a9c05b65fd8..1a911c478cf21f80e9749b3bc768fa01f34f65cc 100644 (file)
--- 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 48e4c8ea4603f958997299543316d8a20917bb49..81e219b82384d8232cde7f6f348ee32544a5c52e 100644 (file)
--- 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 c99341e3e651f8d69f5779aef65ab7181aa8ee4b..c40b43332a5666de5717c0347e17add566633974 100644 (file)
--- 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 \