Introduce a variable called "MAKEINFO_ARGS", which may be used to pass

arguments to makeinfo(1).  This was made necessary by the fact that under
IRIX64 makeinfo(1) does not use a default split-size of 50000, which breaks
our PLISTs.  After feedback from seb@, initialize MAKEINFO_ARGS per default
to _OPSYS_MAKEINFO_ARGS, which is set in defs.<OPSYS>.mk (currently only
for IRIX using 64-bit ABI).

3 files changed, 17 insertions, 5 deletions

diff --git a/mk/bsd.pkg.defaults.mk b/mk/bsd.pkg.defaults.mk
index 202a710b49e..d09caea4481 100644
--- a/mk/bsd.pkg.defaults.mk
+++ b/mk/bsd.pkg.defaults.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.defaults.mk,v 1.156 2003/06/23 15:46:22 salo Exp $
+# $NetBSD: bsd.pkg.defaults.mk,v 1.157 2003/06/29 21:25:49 jschauma Exp $
 #
 
 # A file providing defaults for pkgsrc and the packages collection.
@@ -1158,6 +1158,12 @@ MAJORDOMO_USER?= majordom
 # Possible: any
 # Default: majordom
 
+#MAKEINFO_ARGS?=
+# flags to be passed to makeinfo(1), if any.  Warning: only use if you
+# know what you're doing, may break PLISTs.
+# Possible: any valid flag for makeinfo(1)
+# Default: defaults for various machine_archs may be set in mk/defs.${OPSYS}.mk
+
 MOZILLA_USE_XFT?=	NO
 # Used by mozilla packages to enable Xft support where available.
 # Possible: YES, NO
diff --git a/mk/defs.IRIX.mk b/mk/defs.IRIX.mk
index fdfece49721..a5fc793f3a9 100644
--- a/mk/defs.IRIX.mk
+++ b/mk/defs.IRIX.mk
@@ -1,4 +1,4 @@
-# $NetBSD: defs.IRIX.mk,v 1.27 2003/06/23 21:36:29 jschauma Exp $
+# $NetBSD: defs.IRIX.mk,v 1.28 2003/06/29 21:25:50 jschauma Exp $
 #
 # Variable definitions for the IRIX operating system.
 
@@ -124,6 +124,10 @@ _PREFORMATTED_MAN_DIR=	man		# directory where catman pages are
 _USE_GNU_GETTEXT=	no		# Don't use GNU gettext
 _USE_RPATH=		yes		# add rpath to LDFLAGS
 
+.if defined(ABI) && ${ABI} == "64"
+_OPSYS_MAKEINFO_ARGS=   --split-size=50000  # flags to be passed to makeinfo(1)
+.endif
+
 # flags passed to the linker to extract all symbols from static archives.
 # XXX:
 # These flags are for the IRIX linker.  If GNU ld is used, these would need
diff --git a/mk/texinfo.mk b/mk/texinfo.mk
index 22f31764c90..1fbf6792db5 100644
--- a/mk/texinfo.mk
+++ b/mk/texinfo.mk
@@ -1,4 +1,4 @@
-# $NetBSD: texinfo.mk,v 1.11 2003/06/19 21:41:15 seb Exp $
+# $NetBSD: texinfo.mk,v 1.12 2003/06/29 21:25:49 jschauma Exp $
 #
 # This Makefile fragment is included by bsd.pkg.mk when INFO_FILES and
 # USE_NEW_TEXINFO are defined.
@@ -79,6 +79,8 @@ USE_MAKEINFO?=		NO
 
 .if empty(USE_MAKEINFO:M[nN][oO])
 
+MAKEINFO_ARGS+=         ${_OPSYS_MAKEINFO_ARGS}
+
 # Does the system has a makeinfo command?
 _MAKEINFO=
 .  for _i_ in /usr/bin/makeinfo
@@ -109,9 +111,9 @@ _NEED_TEXINFO=		NO
 BUILD_DEPENDS+=		gtexinfo>=${TEXINFO_REQD}:../../devel/gtexinfo
 _GTEXINFO_PREFIX_DEFAULT=	${LOCALBASE}
 EVAL_PREFIX+=		_GTEXINFO_PREFIX=gtexinfo
-MAKEINFO=		${_GTEXINFO_PREFIX}/bin/makeinfo
+MAKEINFO=		${_GTEXINFO_PREFIX}/bin/makeinfo ${MAKEINFO_ARGS}
 .  else
-MAKEINFO=		${_MAKEINFO}
+MAKEINFO=		${_MAKEINFO} ${MAKEINFO_ARGS}
 .  endif
 
 # When not using buildlink2 set MAKEINFO in environment to the pathname