From mboxrd@z Thu Jan  1 00:00:00 1970
From: Mathieu Lirzin <mthl@gnu.org>
Subject: Re: [PATCH 1/2] build: Use an up to date copy of texinfo.tex
Date: Fri, 24 Feb 2017 20:25:20 +0100
Message-ID: <87r32ntmqn.fsf@gnu.org>
References: <1487765072-32603-1-git-send-email-jmd@gnu.org>
	<1487765072-32603-2-git-send-email-jmd@gnu.org>
Mime-Version: 1.0
Content-Type: text/plain
Return-path: <guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org>
Received: from eggs.gnu.org ([2001:4830:134:3::10]:47867)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <mthl@gnu.org>) id 1chLUa-0000CG-ER
	for guix-devel@gnu.org; Fri, 24 Feb 2017 14:25:25 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <mthl@gnu.org>) id 1chLUZ-0004zc-M2
	for guix-devel@gnu.org; Fri, 24 Feb 2017 14:25:24 -0500
Received: from fencepost.gnu.org ([2001:4830:134:3::e]:44371)
	by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from <mthl@gnu.org>)
	id 1chLUZ-0004zL-Ih
	for guix-devel@gnu.org; Fri, 24 Feb 2017 14:25:23 -0500
In-Reply-To: <1487765072-32603-2-git-send-email-jmd@gnu.org> (John
	Darrington's message of "Wed, 22 Feb 2017 13:04:31 +0100")
List-Id: "Development of GNU Guix and the GNU System distribution."
	<guix-devel.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/guix-devel>,
	<mailto:guix-devel-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/guix-devel/>
List-Post: <mailto:guix-devel@gnu.org>
List-Help: <mailto:guix-devel-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/guix-devel>,
	<mailto:guix-devel-request@gnu.org?subject=subscribe>
Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org
Sender: "Guix-devel" <guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org>
To: John Darrington <jmd@gnu.org>
Cc: guix-devel@gnu.org

Hello John,

John Darrington <jmd@gnu.org> writes:

> * build-aux/texinfo.tex,ref: New file, copied from texlive-minimal
> * bootstrap: Use it, if newer than the texinfo.tex from automake.
> ---
>  bootstrap                 |    11 +-
>  build-aux/texinfo.tex,ref | 11562 ++++++++++++++++++++++++++++++++++++++++++++
>  2 files changed, 11572 insertions(+), 1 deletion(-)
>  create mode 100644 build-aux/texinfo.tex,ref
>

Do you know why building Guix manual fails to build with older
"texinfo.tex"?

If this related to some special texinfo syntax used in Guix manual?

> diff --git a/bootstrap b/bootstrap
> index cb774bc73..052c433a0 100755
> --- a/bootstrap
> +++ b/bootstrap
> @@ -2,4 +2,13 @@
>  # Create the build system.
>  
>  set -e -x
> -exec autoreconf -vfi
> +ref=$(grep '\\def\\texinfoversion' build-aux/texinfo.tex,ref | tr -c -d [:digit:])
> +autoreconf -vfi
> +ac=$(grep '\\def\\texinfoversion' build-aux/texinfo.tex | tr -c -d [:digit:])
> +
> +# Use our reference version of texinfo.tex or the one from automake, whichever
> +# is most recent.
> +if [ $ref -gt $ac ] ; then
> +    cp -f build-aux/texinfo.tex,ref build-aux/texinfo.tex;
> +fi

What about checking in texinfo.tex and removing the -f (--force) option
when invoking 'autoreconf'?  This would ensure that texinfo.tex is not
overwritten.

WDYT?

Thanks.

-- 
Mathieu Lirzin
GPG: F2A3 8D7E EB2B 6640 5761  070D 0ADE E100 9460 4D37