From patchwork Fri May 11 22:30:10 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 1765 Return-Path: Received: from mail01.ipfire.org (mail01.ipfire.org [IPv6:2001:470:7183:25::1]) by web02.i.ipfire.org (Postfix) with ESMTP id 4F48D60993 for ; Fri, 11 May 2018 14:30:42 +0200 (CEST) Received: from mail01.i.ipfire.org (localhost [IPv6:::1]) by mail01.ipfire.org (Postfix) with ESMTP id EE9C01108E16; Fri, 11 May 2018 13:30:41 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=201801; t=1526041842; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:content-type: content-transfer-encoding:in-reply-to:in-reply-to: references:references:list-id:list-unsubscribe:list-subscribe:list-post; bh=B0UAf4IRirBwpuou+pb0ngf5PWJXykDrZFiNDlMB2G0=; b=r434OZbb3XcKJDwsJtfn1Dgr7nVOt4ec1otq0OeJMIQWqA8TmFUoSCTBiZUvFOyTei3Wzx Ri+z3SuefIxiEsc10Ai2AJtRbPnuZNY0JkdtPUGdw3PFlVnsF3hN8gLbGAocUvK3lQrruq UR/yp8yS/yL6ijF0UDAFd3ECc9n1n/dhc4wS4Y/5nU3ZA1IqGi6mIyCPgXmtdUDZ/kD6Al t/jTG1rcylwn4ZbLP489CcN6bUrosyI+KKOuyq9sQ+i0T9tIZqqql/U1f46dBdsnz/gF8u P2fW/2B+ozi4hdmUs3/K4OFnHT34vWicUk+YwSJSJKnXrg9RjxaOYiEXrfSIEg== Authentication-Results: mail01.i.ipfire.org; auth=pass smtp.auth=ms smtp.mailfrom=michael.tremer@ipfire.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=201801; t=1526041831; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:content-type: content-transfer-encoding:in-reply-to:in-reply-to: references:references; bh=B0UAf4IRirBwpuou+pb0ngf5PWJXykDrZFiNDlMB2G0=; b=CZkJBjiEheenVN37y7pJMhDOeVQq94k46xfgb7Vkj0WKXhbVRkgcoh1kqpcLN5wbu1QLXE gHALIkbQhvsw4PhFQF75hkkeNDv+yH+W4JN0rwsMRDkZ8Tlj1EAC8ILzjj+cYWQjZ3GK3p mOSg2oNGvZKH/fgWTv2rlWsJp4emXzLQFiUq14wxKkdSKtS3Ktw2317eXNkhj6bUCVGDnb hv7FNd4E0XCepoLsTVNtHqjEOFLU8OkbmHYUgM+Q9mTTMzVXRyQOuPSk82N7CWhtQIRj+g yx1+sVeYEiJSuQNdDkRPiQI9BHUjuo6mMQYSQVzT3tCghhB5rRkVc2QmRauMOQ== Received: from rice-oxley.tremer.co.uk (unknown [88.98.219.132]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPSA id 980441108DE7; Fri, 11 May 2018 13:30:31 +0100 (BST) From: Michael Tremer 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> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180511123012.2138575-1-michael.tremer@ipfire.org> References: <20180511123012.2138575-1-michael.tremer@ipfire.org> X-Spamd-Result: default: False [-4.04 / 11.00]; ASN(0.00)[asn:56478, ipnet:88.98.216.0/22, country:GB]; DKIM_SIGNED(0.00)[]; TO_DN_SOME(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; FROM_HAS_DN(0.00)[]; BAYES_HAM(-2.94)[99.76%]; ARC_NA(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; RCVD_TLS_ALL(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MID_CONTAINS_FROM(1.00)[]; RCVD_COUNT_ZERO(0.00)[0]; MIME_GOOD(-0.10)[text/plain]; REPLY(-2.00)[] X-Spam-Status: No, score=-4.04 X-Rspamd-Server: mail01.i.ipfire.org Cc: Michael Tremer X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: development-bounces@lists.ipfire.org Sender: "Development" It was impossible to disable the man pages generation before this patch. Signed-off-by: Michael Tremer --- 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 = $(pythondir)/nitsi # ------------------------------------------------------------------------------ .PHONY: man -man: $(MANPAGES) $(MANPAGES_HTML) +man: $(MAN_PAGES) $(MAN_PAGES_HTML) -if ENABLE_MANPAGES -MANPAGES = \ +if ENABLE_MAN_PAGES +MAN_PAGES = \ man/nitsi.1 -MANPAGES_XML = $(patsubst %.1,%.xml,$(patsubst %.5,%.xml,$(MANPAGES))) -MANPAGES_HTML = $(patsubst %.xml,%.html,$(MANPAGES_XML)) +MAN_PAGES_XML = $(patsubst %.1,%.xml,$(patsubst %.5,%.xml,$(MAN_PAGES))) +MAN_PAGES_HTML = $(patsubst %.xml,%.html,$(MAN_PAGES_XML)) man_MANS = \ - $(MANPAGES) + $(MAN_PAGES) noinst_DATA += \ - $(MANPAGES_HTML) + $(MAN_PAGES_HTML) CLEANFILES += \ $(man_MANS) \ - $(MANPAGES_HTML) + $(MAN_PAGES_HTML) EXTRA_DIST += \ - $(MANPAGES_XML) \ + $(MAN_PAGES_XML) \ man/custom-html.xsl XSLTPROC_FLAGS = \ @@ -102,4 +102,4 @@ SED_PROCESS = \ < $< > $@ 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]) # ------------------------------------------------------------------------------ -have_manpages=no -AC_ARG_ENABLE(manpages, AS_HELP_STRING([--disable-man-pages], +have_man_pages=no +AC_ARG_ENABLE(man-pages, AS_HELP_STRING([--disable-man-pages], [do not install man pages])) -AS_IF([test "x$enable_manpages" != xno], [have_manpages=yes]) -AM_CONDITIONAL(ENABLE_MANPAGES, [test "x$have_manpages" = "xyes"]) +AS_IF([test "x$enable_man_pages" != xno], [have_man_pages=yes]) +AM_CONDITIONAL(ENABLE_MAN_PAGES, [test "x$have_man_pages" = "xyes"]) # ------------------------------------------------------------------------------ @@ -62,5 +62,5 @@ AC_MSG_RESULT([ prefix: ${prefix} sysconfdir: ${sysconfdir} - Generate man-pages: ${have_manpages} -]) \ No newline at end of file + Generate man-pages: ${have_man_pages} +])