Get rid of help2man.

fixes #4706

diff --git a/INSTALL b/INSTALL
index 282dbc6ade239feaf37021e771367a85e8b2d1a8..4d47a81ce8b020ab0b8f6fa699ac8700052a5068 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -36,7 +36,6 @@ mentioned above:
                libltdl-dev on Debian)
 * GNU bison (bison)
 * GNU flex (flex)
-* GNU help2man (help2man)
 
 Building Icinga 2
 -----------------

diff --git a/autogen.sh b/autogen.sh
index 32cea422d2b5d3c9cf3f746b3380cc69f99f68ce..c127371d7f11f261c55764cef7c7a4556839a04e 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -107,13 +107,6 @@ fi
   NO_AUTOMAKE=yes
 }
 
-(help2man --version) < /dev/null > /dev/null 2>&1 || {
-  echo
-  echo "**Error**: You must have \`help2man' installed."
-  echo "You can get it from: ftp://ftp.gnu.org/pub/gnu/"
-  DIE=1
-}
-
 # if no automake, don't bother testing for aclocal
 test -n "$NO_AUTOMAKE" || (aclocal --version) < /dev/null > /dev/null 2>&1 || {
   echo

diff --git a/configure.ac b/configure.ac
index 0db6166247f7eb79ec8f135a68a92591ff7eed1e..68871ced1277f515360066666fae057fbf16d7b1 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -57,8 +57,6 @@ DX_PS_FEATURE(OFF)
 DX_INIT_DOXYGEN([icinga], [docs/Doxyfile], [docs/dev])
 AD_INIT_ASCIIDOC([icinga], [docs])
 
-AM_MISSING_PROG(HELP2MAN, help2man, $missing_dir)
-
 AC_PROG_INSTALL
 AC_PROG_LEX
 AC_PROG_YACC

diff --git a/docs/Makefile.am b/docs/Makefile.am
index 3910cbf14026d50a985334fa5be4cfffd875e204..85d8520a990400dc6d581249eb004d1c4bc0d5ac 100644 (file)
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -38,14 +38,6 @@ icinga2doc_DATA += \
        $(AD_ENV) $(AD_ASCIIDOC) -d book -a toc -a numbered -o $@ $<
 endif AD_COND_doc
 
-icinga2.8: $(top_builddir)/icinga-app/icinga2
-       -$(HELP2MAN) --name='The Icinga 2 networking monitoring daemon.' --section=8 --no-info --output=$@ $(top_builddir)/icinga-app/icinga2
-
-# The icinga2.8 file is in EXTRA_DIST which means we need to build it when "make dist" is run.
-# Unfortunately in order to build this man page we need to build Icinga 2. Meh.
-$(top_builddir)/icinga-app/icinga2:
-       $(MAKE) -C  $(top_builddir)
-
 clean:
        rm -f $(icinga2doc_DATA)
 

diff --git a/docs/icinga2.8 b/docs/icinga2.8
new file mode 100644 (file)
index 0000000..aa4a1ff
--- /dev/null
+++ b/docs/icinga2.8
@@ -0,0 +1,62 @@
+.TH ICINGA2 "8" "September 2013" "icinga2 - The Icinga 2 network monitoring daemon." "System Administration Utilities"
+
+.SH NAME
+icinga2 \- The Icinga 2 networking monitoring daemon.
+
+.SH DESCRIPTION
+icinga2 \- The Icinga 2 network monitoring daemon.
+
+.SH OPTIONS
+.TP
+\fB\-\-help\fR
+show this help message
+.TP
+\fB\-V\fR [ \fB\-\-version\fR ]
+show version information
+.TP
+\fB\-l\fR [ \fB\-\-library\fR ] arg
+load a library
+.TP
+\fB\-I\fR [ \fB\-\-include\fR ] arg
+add include search directory
+.TP
+\fB\-c\fR [ \fB\-\-config\fR ] arg
+parse a configuration file
+.TP
+\fB\-C\fR [ \fB\-\-validate\fR ]
+exit after validating the configuration
+.TP
+\fB\-x\fR [ \fB\-\-debug\fR ]
+enable debugging
+.TP
+\fB\-d\fR [ \fB\-\-daemonize\fR ]
+detach from the controlling terminal
+.TP
+\fB\-e\fR [ \fB\-\-errorlog\fR ] arg log fatal errors to the specified log file (only works
+in combination with \fB\-\-daemonize\fR)
+.TP
+\fB\-u\fR [ \fB\-\-user\fR ] arg
+user to run Icinga as
+.TP
+\fB\-g\fR [ \fB\-\-group\fR ] arg
+group to run Icinga as
+
+.SH FILES
+.TP
+.IP /etc/icinga2
+Default configuration directory for Icinga2
+
+.SH AUTHOR
+Icinga2 is maintained by the Icinga Project <info@icinga.org>.
+
+.SH "REPORTING BUGS"
+Report bugs at <https://dev.icinga.org/>
+.br
+Icinga home page: <http://www.icinga.org/>
+
+.SH COPYRIGHT
+Copyright \(co 2012\-2013 Icinga Development Team (http://www.icinga.org)
+License GPLv2+: GNU GPL version 2 or later <http://gnu.org/licenses/gpl2.html>
+.br
+This is free software: you are free to change and redistribute it.
+There is NO WARRANTY, to the extent permitted by law.

diff --git a/icinga2.spec b/icinga2.spec
index c8fb6bbd29005fcfb66739c192c2f55b5edbbb7c..d88b962b5d718841bdb8147b23ef349603f87dcd 100644 (file)
--- a/icinga2.spec
+++ b/icinga2.spec
@@ -18,7 +18,6 @@ BuildRequires: libtool-ltdl-devel
 BuildRequires: automake
 BuildRequires: autoconf
 BuildRequires: libtool
-BuildRequires: help2man
 BuildRequires: flex
 BuildRequires: bison