Subject: texinfo.mk & redhat 7.3
To: None <tech-pkg@netbsd.org>
From: David Brownlee <abs@mono.org>
List: tech-pkg
Date: 01/27/2003 14:31:20
Redhat 7.3 puts install-info in /sbin, which nicely messes with
texinfo.mk.
Can anyone think of a better way to handle this than the
following?
--
David/abs(olute) abs@mono.org
Index: texinfo.mk
===================================================================
RCS file: /cvsroot/pkgsrc/mk/texinfo.mk,v
retrieving revision 1.6
diff -u -r1.6 texinfo.mk
--- texinfo.mk 2002/11/14 04:04:13 1.6
+++ texinfo.mk 2003/01/27 12:41:07
@@ -7,7 +7,11 @@
TEXINFO_MK= # defined
# Does the system have the GNU texinfo tools and if yes, what version are they?
+.if exists(/usr/bin/install-info)
_INSTALL_INFO= /usr/bin/install-info
+.else
+_INSTALL_INFO= /sbin/install-info
+.endif
.if exists(${_INSTALL_INFO})
. if !defined(INSTALL_INFO_VERSION)
_INSTALL_INFO_VERSION_OUTPUT!= ${_INSTALL_INFO} --version 2>/dev/null
@@ -34,6 +38,9 @@
DEPENDS+= gtexinfo>=${TEXINFO_REQD}:../../devel/gtexinfo
_GTEXINFO_PREFIX_DEFAULT=${LOCALBASE}
EVAL_PREFIX+= _GTEXINFO_PREFIX=gtexinfo
+.elif ${_INSTALL_INFO} == /sbin/install-info
+_GTEXINFO_PREFIX= /usr
+INSTALL_INFO= ${_INSTALL_INFO}
.else
_GTEXINFO_PREFIX= ${_INSTALL_INFO:C|/bin/install-info$||}
.endif
@@ -41,7 +48,7 @@
#
# Advertise in environment which install-info and makeinfo should be used.
#
-INSTALL_INFO= ${_GTEXINFO_PREFIX}/bin/install-info
+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}"