Fix null ptr exception in Zone::GetLocalZone()

[icinga2] / INSTALL

diff --git a/INSTALL b/INSTALL
index d51440dd65a27488e46272a96044703f8b86c228..a3402425abe774c8b144bf505f6ed13374d84d22 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -30,7 +30,6 @@ parentheses):
 * GNU bison (bison)
 * GNU flex (flex) >= 2.5.35
 * recommended: libexecinfo on FreeBSD
-* optional: Doxygen (doxygen)
 * optional: MySQL (mysql-devel on RHEL, libmysqlclient-dev on Debian)
 * optional: Python (python-devel on RHEL, python-dev on Debian)
 
@@ -81,6 +80,8 @@ Note: CMake determines the Icinga 2 version number using "git describe" if the
 source directory is contained in a Git repository. Otherwise the version number
 is extracted from the icinga2.spec file. This behavior can be overridden by
 creating a file called "icinga-version.h.force" in the source directory.
+Alternatively the -DICINGA2_GIT_VERSION_INFO=ON option for CMake can be used to
+disable the usage of "git describe".
 
 Use "git archive" to build the release tarball:
 
@@ -140,16 +141,3 @@ configuration format is explained in detail in the doc/ directory.
 By default "make install" installs example configuration files in
 /usr/local/etc/icinga2 unless you have specified a different prefix or
 sysconfdir.
-
-
-Package Builds
---------------
-
-In order to create a snapshot tarball, create a new release directory outside
-the source tree and run cmake and make. Replace <version> with the correct
-string.
-
-$ cd ..
-$ mkdir icinga2-release && cd icinga2-release
-$ cmake ../icinga2 -DCPACK_SOURCE_GENERATE=TGZ -DCPACK_SOURCE_PACKAGE_FILE_NAME=icinga2-<version>
-$ make package_source