From b19eedf8ec20ed21e974b70905364468d9cce1ff Mon Sep 17 00:00:00 2001
From: Gunnar Beutner <gunnar.beutner@netways.de>
Date: Tue, 12 Mar 2013 09:58:27 +0100
Subject: [PATCH] Fix: $prefix/var not created during 'make install', fails on
 cmd pipe creation

Fixes #3815
---
 Makefile.am           | 29 +++++------------------------
 configure.ac          |  1 +
 etc/init.d/icinga2.in |  2 ++
 3 files changed, 8 insertions(+), 24 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 6605fc986..9a1554db6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -24,30 +24,11 @@ icinga2doc_DATA = \
 	INSTALL \
 	NEWS
 
-#log
-icinga2logdir = ${localstatedir}/log/${PACKAGE}
-icinga2log_DATA =
-
-#cache
-icinga2cachedir = ${localstatedir}/cache/${PACKAGE}
-icinga2cache_DATA =
-
-#variablestate
-icinga2varstatedir = ${localstatedir}/lib/${PACKAGE}
-icinga2varstate_DATA =
-
-#run
-icinga2rundir = ${localstatedir}/run/${PACKAGE}
-icinga2run_DATA =
-
-#bin
-icinga2sbindir = ${sbindir}
-icinga2sbin_DATA =
-
-#lib
-icinga2libdir = ${libdir}/${PACKAGE}
-icinga2lib_DATA =
-
+install-data-local:
+	$(MKDIR_P) ${localstatedir}/log/${PACKAGE}
+	$(MKDIR_P) ${localstatedir}/cache/${PACKAGE}
+	$(MKDIR_P) ${localstatedir}/lib/${PACKAGE}
+	$(MKDIR_P) ${localstatedir}/run/${PACKAGE}
 
 EXTRA_DIST = $(icinga2doc_DATA) git_version.sh icinga2.spec
 
diff --git a/configure.ac b/configure.ac
index 7b8788042..89319389a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -31,6 +31,7 @@ AC_PROG_CXX
 AC_LANG_CPLUSPLUS
 AC_PROG_CC
 AC_LANG_C
+AC_PROG_MKDIR_P
 
 AC_FUNC_VFORK
 
diff --git a/etc/init.d/icinga2.in b/etc/init.d/icinga2.in
index 65398b813..248132f10 100644
--- a/etc/init.d/icinga2.in
+++ b/etc/init.d/icinga2.in
@@ -37,6 +37,8 @@ fi
 
 # Start Icinga 2
 start() {
+	mkdir -p `dirname -- $ICINGA2_PID_FILE`
+
         printf "Starting Icinga 2: "
         $DAEMON -c $ICINGA2_CONFIG_FILE -d
         echo "Done"
-- 
2.40.0