From 7cbf83dab0cdc03f52632842418f8de68e29d83d Mon Sep 17 00:00:00 2001
From: seb <seb@pkgsrc.org>
Date: Tue, 1 Jul 2003 14:56:25 +0000
Subject: Only consider as makeinfo's version the first version number looking
 word in `makeinfo --version'.

This is needed for older makeinfo which output thing like:

makeinfo (GNU texinfo 3.12) 1.68
Copyright (C) 1998 Free Software Foundation, Inc.
....

This should fix the problem encountered by Thorsten Frueauf on 1.5.4_ALPHA
(I reproduced it on stock 1.5.3) and reported in private email via
jschauma@.
---
 mk/texinfo.mk | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'mk')

diff --git a/mk/texinfo.mk b/mk/texinfo.mk
index 1fbf6792db5..296f3025e3b 100644
--- a/mk/texinfo.mk
+++ b/mk/texinfo.mk
@@ -1,4 +1,4 @@
-# $NetBSD: texinfo.mk,v 1.12 2003/06/29 21:25:49 jschauma Exp $
+# $NetBSD: texinfo.mk,v 1.13 2003/07/01 14:56:25 seb Exp $
 #
 # This Makefile fragment is included by bsd.pkg.mk when INFO_FILES and
 # USE_NEW_TEXINFO are defined.
@@ -94,7 +94,12 @@ _MAKEINFO=	${_i_}
 # the following would have to be changed as well as the comparison below.
 .  if !empty(_MAKEINFO) && !defined(MAKEINFO_VERSION)
 MAKEINFO_VERSION_OUTPUT!=	${_MAKEINFO} --version 2>/dev/null || ${ECHO}
-MAKEINFO_VERSION=${MAKEINFO_VERSION_OUTPUT:M[0-9]*.[0-9]*:C/[^0-9.]//}
+MAKEINFO_VERSION=
+.    for _i_ in ${MAKEINFO_VERSION_OUTPUT:M[0-9]*.[0-9]*:C/[^0-9.]//}
+.       if empty(MAKEINFO_VERSION)
+MAKEINFO_VERSION=	${_i_}
+.       endif
+.    endfor
 MAKEFLAGS+=			MAKEINFO_VERSION=${MAKEINFO_VERSION}
 .  endif
 
-- 
cgit v1.2.3