kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Only consider as makeinfo's version the first version number looking word

Browse source 
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@.
This commit is contained in:
seb 2003-07-01 14:56:25 +00:00
parent 5cf27e54eb
commit 7cbf83dab0
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
mk/texinfo.mk
View file

@ -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