On Mon, Jan 27, 2003 at 03:28:35PM +0000, David Brownlee wrote:
> 	OK - I'll stay clear of this then - let me know if I can be any
> 	help in testing anything :)

What about the following patch?
Throwing things in defs.*.mk looked like too much trouble in the end as
it seems that install-info had moved a bit in RH tree...
The assumption about /usr/bin/makeinfo is not really satisfactory
but I can live with it for now.

Cheers, Stoned.


Index: texinfo.mk
===================================================================
RCS file: /cvsroot/pkgsrc/mk/texinfo.mk,v
retrieving revision 1.7
diff -u -u -r1.7 texinfo.mk
--- texinfo.mk	2003/01/28 00:08:29	1.7
+++ texinfo.mk	2003/01/28 00:30:48
@@ -7,8 +7,13 @@
 TEXINFO_MK=	# defined
 
 # Does the system have the GNU texinfo tools and if yes, what version are they?
-_INSTALL_INFO=	/usr/bin/install-info
-.if exists(${_INSTALL_INFO})
+_INSTALL_INFO=
+.for _i_ in /usr/bin/install-info /sbin/install-info
+.  if exists(${_i_})
+_INSTALL_INFO=	${_i_}
+.  endif
+.endfor
+.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
@@ -34,15 +39,16 @@
 DEPENDS+=		gtexinfo>=${TEXINFO_REQD}:../../devel/gtexinfo
 _GTEXINFO_PREFIX_DEFAULT=${LOCALBASE}
 EVAL_PREFIX+=		_GTEXINFO_PREFIX=gtexinfo
+INSTALL_INFO=	${_GTEXINFO_PREFIX}/bin/install-info
+MAKEINFO=	${_GTEXINFO_PREFIX}/bin/makeinfo
 .else
-_GTEXINFO_PREFIX=	${_INSTALL_INFO:C|/bin/install-info$||}
+INSTALL_INFO=	${_INSTALL_INFO}
+MAKEINFO=	/usr/bin/makeinfo	# we assume it!
 .endif
 
 #
 # Advertise in environment which install-info and makeinfo should be used.
 #
-INSTALL_INFO=	${_GTEXINFO_PREFIX}/bin/install-info
-MAKEINFO=	${_GTEXINFO_PREFIX}/bin/makeinfo
 CONFIGURE_ENV+=	MAKEINFO="${MAKEINFO}" INSTALL_INFO="${INSTALL_INFO}"
 MAKE_ENV+=	MAKEINFO="${MAKEINFO}" INSTALL_INFO="${INSTALL_INFO}"