From mboxrd@z Thu Jan  1 00:00:00 1970
From: Michael Tremer <michael.tremer@ipfire.org>
To: development@lists.ipfire.org
Subject: [PATCH 3/5] configure: Fix spelling of man-pages
Date: Fri, 11 May 2018 13:30:10 +0100
Message-ID: <20180511123012.2138575-3-michael.tremer@ipfire.org>
In-Reply-To: <20180511123012.2138575-1-michael.tremer@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============6000334972289909576=="
List-Id: <development.lists.ipfire.org>

--===============6000334972289909576==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

It was impossible to disable the man pages generation
before this patch.

Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
---
 Makefile.am  | 20 ++++++++++----------
 configure.ac | 12 ++++++------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 4370355c34b8..dadb50941269 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -42,27 +42,27 @@ nitsidir =3D $(pythondir)/nitsi
 # --------------------------------------------------------------------------=
----
=20
 .PHONY: man
-man: $(MANPAGES) $(MANPAGES_HTML)
+man: $(MAN_PAGES) $(MAN_PAGES_HTML)
=20
-if ENABLE_MANPAGES
-MANPAGES =3D \
+if ENABLE_MAN_PAGES
+MAN_PAGES =3D \
 	man/nitsi.1
=20
-MANPAGES_XML  =3D $(patsubst %.1,%.xml,$(patsubst %.5,%.xml,$(MANPAGES)))
-MANPAGES_HTML =3D $(patsubst %.xml,%.html,$(MANPAGES_XML))
+MAN_PAGES_XML  =3D $(patsubst %.1,%.xml,$(patsubst %.5,%.xml,$(MAN_PAGES)))
+MAN_PAGES_HTML =3D $(patsubst %.xml,%.html,$(MAN_PAGES_XML))
=20
 man_MANS =3D \
-	$(MANPAGES)
+	$(MAN_PAGES)
=20
 noinst_DATA +=3D \
-	$(MANPAGES_HTML)
+	$(MAN_PAGES_HTML)
=20
 CLEANFILES +=3D \
 	$(man_MANS) \
-	$(MANPAGES_HTML)
+	$(MAN_PAGES_HTML)
=20
 EXTRA_DIST +=3D \
-	$(MANPAGES_XML) \
+	$(MAN_PAGES_XML) \
 	man/custom-html.xsl
=20
 XSLTPROC_FLAGS =3D \
@@ -102,4 +102,4 @@ SED_PROCESS =3D \
 		< $< > $@
=20
 nitsi: nitsi.in Makefile
-	$(SED_PROCESS)
\ No newline at end of file
+	$(SED_PROCESS)
diff --git a/configure.ac b/configure.ac
index 279309bf538d..23b69d5ed886 100644
--- a/configure.ac
+++ b/configure.ac
@@ -43,11 +43,11 @@ PKG_PROG_PKG_CONFIG
 m4_pattern_forbid([^_?PKG_[A-Z_]+$],[*** pkg.m4 missing, please install pkg-=
config])
=20
 # --------------------------------------------------------------------------=
----
-have_manpages=3Dno
-AC_ARG_ENABLE(manpages, AS_HELP_STRING([--disable-man-pages],
+have_man_pages=3Dno
+AC_ARG_ENABLE(man-pages, AS_HELP_STRING([--disable-man-pages],
 	[do not install man pages]))
-AS_IF([test "x$enable_manpages" !=3D xno], [have_manpages=3Dyes])
-AM_CONDITIONAL(ENABLE_MANPAGES, [test "x$have_manpages" =3D "xyes"])
+AS_IF([test "x$enable_man_pages" !=3D xno], [have_man_pages=3Dyes])
+AM_CONDITIONAL(ENABLE_MAN_PAGES, [test "x$have_man_pages" =3D "xyes"])
=20
 # --------------------------------------------------------------------------=
----
=20
@@ -62,5 +62,5 @@ AC_MSG_RESULT([
 	prefix:			${prefix}
 	sysconfdir:		${sysconfdir}
=20
-	Generate man-pages:	${have_manpages}
-])
\ No newline at end of file
+	Generate man-pages:	${have_man_pages}
+])
--=20
2.17.0


--===============6000334972289909576==--