From patchwork Wed Dec 26 14:34:07 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pablo Neira Ayuso X-Patchwork-Id: 208175 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id B21EB2C00A6 for ; Thu, 27 Dec 2012 01:34:16 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752261Ab2LZOeP (ORCPT ); Wed, 26 Dec 2012 09:34:15 -0500 Received: from mail.us.es ([193.147.175.20]:45665 "EHLO mail.us.es" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751492Ab2LZOeO (ORCPT ); Wed, 26 Dec 2012 09:34:14 -0500 Received: (qmail 3641 invoked from network); 26 Dec 2012 15:34:13 +0100 Received: from unknown (HELO us.es) (192.168.2.12) by us.es with SMTP; 26 Dec 2012 15:34:13 +0100 Received: (qmail 14970 invoked by uid 507); 26 Dec 2012 14:34:13 -0000 X-Qmail-Scanner-Diagnostics: from 127.0.0.1 by antivirus2 (envelope-from , uid 501) with qmail-scanner-2.10 (clamdscan: 0.97.6/16113. spamassassin: 3.3.2. Clear:RC:1(127.0.0.1):SA:0(-99.2/7.5):. Processed in 5.561454 secs); 26 Dec 2012 14:34:13 -0000 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on antivirus2 X-Spam-Level: X-Spam-Status: No, score=-99.2 required=7.5 tests=BAYES_50, RP_MATCHES_RCVD, SPF_HELO_FAIL, USER_IN_WHITELIST autolearn=disabled version=3.3.2 X-Envelope-From: pneira@us.es Received: from unknown (HELO antivirus2) (127.0.0.1) by us.es with SMTP; 26 Dec 2012 14:34:07 -0000 Received: from 192.168.1.13 (192.168.1.13) by antivirus2 (F-Secure/fsigk_smtp/407/antivirus2); Wed, 26 Dec 2012 15:34:07 +0100 (CET) X-Virus-Status: clean(F-Secure/fsigk_smtp/407/antivirus2) Received: (qmail 10609 invoked from network); 26 Dec 2012 15:34:07 +0100 Received: from 1984.lsi.us.es (HELO us.es) (1984lsi@150.214.188.80) by us.es with AES128-SHA encrypted SMTP; 26 Dec 2012 15:34:07 +0100 Date: Wed, 26 Dec 2012 15:34:07 +0100 From: Pablo Neira Ayuso To: Jan Engelhardt Cc: netfilter-devel@vger.kernel.org Subject: Re: [PATCH 01/13] doc: add package version to all manpages Message-ID: <20121226143407.GA32053@1984> References: <1356477089-13241-1-git-send-email-jengelh@inai.de> <1356477089-13241-2-git-send-email-jengelh@inai.de> <20121226143300.GB31482@1984> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20121226143300.GB31482@1984> User-Agent: Mutt/1.5.20 (2009-06-14) Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org On Wed, Dec 26, 2012 at 03:33:00PM +0100, Pablo Neira Ayuso wrote: [...] > > +iptables-apply.8: ${srcdir}/iptables-apply.8.in > > + ${fill_in_date} > > + > > +iptables-restore.8: ${srcdir}/iptables-restore.8.in > > + ${fill_in_date} > > + > > +iptables-save.8: ${srcdir}/iptables-save.8.in > > + ${fill_in_date} > > + > > +iptables.8: ${srcdir}/iptables.8.in > > + ${fill_in_date} > > This belongs more naturally to the ./configure stage, including > setting the date via AC_SUBST. You should be able to make it with > little changes in configure.ac. > > For iptables-extensions.8 it will be a special case, it still requires > part of the magic in the makefile to build the page. See patch for instance. From 8899a031b9498349aa113146d2eeb3dbccdcc868 Mon Sep 17 00:00:00 2001 From: Pablo Neira Ayuso Date: Mon, 12 Nov 2012 08:06:14 +0100 Subject: [PATCH] build: add iptables manpage version during at ./configure stage For both iptables and ip6tables, instead of at make stage. Signed-off-by: Pablo Neira Ayuso --- configure.ac | 3 ++- iptables/Makefile.am | 6 ------ iptables/ip6tables.8.in | 2 +- iptables/iptables.8.in | 2 +- 4 files changed, 4 insertions(+), 9 deletions(-) diff --git a/configure.ac b/configure.ac index e644308..3e27e02 100644 --- a/configure.ac +++ b/configure.ac @@ -127,5 +127,6 @@ AC_CONFIG_FILES([Makefile extensions/GNUmakefile include/Makefile libiptc/Makefile libiptc/libiptc.pc libiptc/libip4tc.pc libiptc/libip6tc.pc libxtables/Makefile utils/Makefile - include/xtables-version.h include/iptables/internal.h]) + include/xtables-version.h include/iptables/internal.h + iptables/iptables.8 iptables/ip6tables.8]) AC_OUTPUT diff --git a/iptables/Makefile.am b/iptables/Makefile.am index 61e78db..a476171 100644 --- a/iptables/Makefile.am +++ b/iptables/Makefile.am @@ -38,12 +38,6 @@ if ENABLE_IPV6 v6_sbin_links = ip6tables ip6tables-restore ip6tables-save endif -iptables.8: ${srcdir}/iptables.8.in - ${AM_VERBOSE_GEN} sed -e 's/@PACKAGE_AND_VERSION@/${PACKAGE} ${PACKAGE_VERSION}/g' $< >$@; - -ip6tables.8: ${srcdir}/ip6tables.8.in - ${AM_VERBOSE_GEN} sed -e 's/@PACKAGE_AND_VERSION@/${PACKAGE} ${PACKAGE_VERSION}/g' $< >$@; - iptables-extensions.8: ${srcdir}/iptables-extensions.8.in ../extensions/matches.man ../extensions/targets.man ${AM_VERBOSE_GEN} sed -e \ 's/@PACKAGE_AND_VERSION@/${PACKAGE} ${PACKAGE_VERSION}/g' \ diff --git a/iptables/ip6tables.8.in b/iptables/ip6tables.8.in index 078bcac..328a0e3 100644 --- a/iptables/ip6tables.8.in +++ b/iptables/ip6tables.8.in @@ -1,4 +1,4 @@ -.TH IP6TABLES 8 "" "@PACKAGE_AND_VERSION@" "@PACKAGE_AND_VERSION@" +.TH IP6TABLES 8 "" "@PACKAGE_NAME@ @PACKAGE_VERSION@" "@PACKAGE_NAME@ @PACKAGE_VERSION@" .\" .\" Man page written by Andras Kis-Szabo .\" It is based on iptables man page. diff --git a/iptables/iptables.8.in b/iptables/iptables.8.in index d6b409d..596c329 100644 --- a/iptables/iptables.8.in +++ b/iptables/iptables.8.in @@ -1,4 +1,4 @@ -.TH IPTABLES 8 "" "@PACKAGE_AND_VERSION@" "@PACKAGE_AND_VERSION@" +.TH IPTABLES 8 "" "@PACKAGE_NAME@ @PACKAGE_VERSION@" "@PACKAGE_NAME@ @PACKAGE_VERSION@" .\" .\" Man page written by Herve Eychenne (May 1999) .\" It is based on ipchains page. -- 1.7.10.4