install: create all dirs needed by automake install

refs #3228

diff --git a/Makefile.am b/Makefile.am
index 672c7d93733f295a5b23b3950bf1a944f99b4128..eb7f2a2916993d1828ef5d27508411dd6fdc478a 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -9,8 +9,8 @@ SUBDIRS = \
        components \
        icinga-app \
        test
-
-icinga2docdir = ${prefix}/share/doc/icinga2
+#doc
+icinga2docdir = ${docdir}
 icinga2doc_DATA = \
        README \
        COPYING \
@@ -20,8 +20,32 @@ 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
+icinga2run_DATA =
+
+#bin
+icinga2sbindir = ${sbindir}
+icinga2sbin_DATA =
+
+#lib
+icinga2libdir = ${libdir}/${PACKAGE}
+icinga2lib_DATA =
+
 
-EXTRA_DIST = $(icinga2doc_DATA) git_version.sh icinga2.spec
+EXTRA_DIST = $(icinga2doc_DATA) $(icinga2logdir) $(icinga2cachedir) $(icinga2varstatedir) $(icinga2rundir) $(icinga2sbindir) $(icinga2libdir) git_version.sh icinga2.spec
 
 
 # Remove doc directory on uninstall

diff --git a/components/compat/Makefile.am b/components/compat/Makefile.am
index 0c57378ec6515d2b838c3a325b7f0249917bc849..830d100de32d2cf3e8d24528a60a2234f2564029 100644 (file)
--- a/components/compat/Makefile.am
+++ b/components/compat/Makefile.am
@@ -1,8 +1,4 @@
 ## Process this file with automake to produce Makefile.in
-icinga2localstatedir = $(localstatedir)/icinga2
-icinga2localstate_DATA = 
-
-EXTRA_DIST = $(icinga2localstate_DATA)
 
 pkglib_LTLIBRARIES = \
        compat.la