made help2man optional

diff --git a/NEWS b/NEWS
index 5a3c078..009b3fd 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -13,6 +13,7 @@ v1.1.4
 * Support max/min sensor information from providers.
 * Fixed string not translatable. (Closes: #138076).
 * Added a default high threshold for temperature.
+* Made help2man optional.
 
 v1.1.3
 ------

diff --git a/README b/README
index 3b50a77..bc41445 100644 (file)
--- a/README
+++ b/README
@@ -116,7 +116,7 @@ The compilation of +psensor+ requires:
  * lm-sensors
  * library sensors4
  * library gtk3 >=3.4
- * help2man 
+ * help2man (optional, required to produce the manpage)
  * asciidoc (optional, required to produce the html version of the
    faq)
  * cppcheck (optional, static source checker)

diff --git a/configure.ac b/configure.ac
index 31eae2d..ca37fe1 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -256,6 +256,7 @@ AC_CONFIG_FILES([
 ])
 
 AC_CHECK_PROGS([HELP2MAN], [help2man])
+AM_CONDITIONAL(HELP2MAN, test -n "$HELP2MAN")
 
 AC_CHECK_PROG([ASCIIDOC], [asciidoc], yes)
 AM_CONDITIONAL(ASCIIDOC, test -n "$ASCIIDOC")

diff --git a/src/Makefile.am b/src/Makefile.am
index 26883d4..8779d9e 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -105,9 +105,11 @@ AM_CPPFLAGS += $(CURL_CFLAGS) $(JSON_CFLAGS)
 endif
 endif
 
+if HELP2MAN
 psensor.1: main.c $(top_srcdir)/configure.ac
        $(MAKE) $(AM_MAKEFLAGS) psensor$(EXEEXT)
        help2man --include=description.txt -N --name="Temperature monitoring application" --output=psensor.1 ./psensor$(EXEEXT)
+endif
 
 gsettings_SCHEMAS=psensor.gschema.xml
 

diff --git a/src/server/Makefile.am b/src/server/Makefile.am
index 0697e58..2812001 100644 (file)
--- a/src/server/Makefile.am
+++ b/src/server/Makefile.am
@@ -29,8 +29,11 @@ AM_CPPFLAGS += $(ATASMART_CFLAGS)
 LIBS += $(ATASMART_LIBS)
 endif
 
-dist_man_MANS =  psensor-server.1
-EXTRA_DIST = description.txt
+if HELP2MAN
 psensor-server.1: server.c $(top_srcdir)/configure.ac
        $(MAKE) $(AM_MAKEFLAGS) psensor-server$(EXEEXT)
        help2man --include=description.txt -N --name="Temperature and system monitoring Web server" --output=psensor-server.1 ./psensor-server$(EXEEXT)
+endif
+
+dist_man_MANS =  psensor-server.1
+EXTRA_DIST = description.txt