diff options
| author | agc <agc> | 2003-02-14 21:52:49 +0000 |
|---|---|---|
| committer | agc <agc> | 2003-02-14 21:52:49 +0000 |
| commit | 61b849307b4b33b4e1b5d0ad72f4abb76f4c610e (patch) | |
| tree | 81b2fcc50446c695d02b8cecc3efe8d1430d0a6e /mk | |
| parent | 0dbfc8506bf074498dd2f188e7eea5c98011ab25 (diff) | |
| download | pkgsrc-61b849307b4b33b4e1b5d0ad72f4abb76f4c610e.tar.gz | |
Pullup version 1.9 to the pkgsrc 1.6.1 branch.
Requested by David Brownlee.
> Date: Thu, 13 Feb 2003 20:51:56 +0200 (EET)
> From: David Brownlee <abs@netbsd.org>
>
> Module Name: pkgsrc
> Committed By: abs
> Date: Thu Feb 13 18:51:56 UTC 2003
>
> Modified Files:
> pkgsrc/mk: texinfo.mk
>
> Log Message:
> When comparing install-info version, ignore non [0-9.] - treat 4.0b as 4.0
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/texinfo.mk | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mk/texinfo.mk b/mk/texinfo.mk index 1c6d7bfd5cc..4719e85a988 100644 --- a/mk/texinfo.mk +++ b/mk/texinfo.mk @@ -1,4 +1,4 @@ -# $NetBSD: texinfo.mk,v 1.8 2003/01/28 20:03:02 seb Exp $ +# $NetBSD: texinfo.mk,v 1.8.2.1 2003/02/14 21:52:49 agc Exp $ # # This Makefile fragment is included by packages that provide info files. # @@ -16,9 +16,9 @@ _INSTALL_INFO= ${_i_} .if !empty(_INSTALL_INFO) . if !defined(INSTALL_INFO_VERSION) _INSTALL_INFO_VERSION_OUTPUT!= ${_INSTALL_INFO} --version 2>/dev/null -# if install-info departs from the [0-9].[0-9] numbering scheme, the following -# would have to be changed as well as the comparison below -INSTALL_INFO_VERSION= ${_INSTALL_INFO_VERSION_OUTPUT:M[0-9]*.[0-9]*} +# If the install-info version contains useful information outside [0-9].[0-9], +# the following would have to be changed as well as the comparison below +INSTALL_INFO_VERSION=${_INSTALL_INFO_VERSION_OUTPUT:M[0-9]*.[0-9]*:C/[^0-9.]//} MAKEFLAGS+= INSTALL_INFO_VERSION=${INSTALL_INFO_VERSION} . endif .endif |