makeinfo --no-split, simplifies sets immensely.

Approved deraadt@, kettenis@

9 files changed, 28 insertions, 55 deletions

diff --git a/gnu/egcs/gcc/Makefile.bsd-wrapper b/gnu/egcs/gcc/Makefile.bsd-wrapper
index 85a3bbe2acb..4729a5753e1 100644
--- a/gnu/egcs/gcc/Makefile.bsd-wrapper
+++ b/gnu/egcs/gcc/Makefile.bsd-wrapper
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.bsd-wrapper,v 1.19 2004/02/21 01:03:11 espie Exp $
+#	$OpenBSD: Makefile.bsd-wrapper,v 1.20 2006/07/12 23:00:07 espie Exp $
 
 MAN=		cpp.1 gcc.1 protoize.1 gcov.1
 MLINKS+=	gcc.1 cc.1
@@ -13,35 +13,8 @@ MLINKS+=	g++.1 c++.1
 MLINKS+=	g77.1 f77.1
 .endif
 
-FAKE_FILES=	/usr/share/info/cpp.info-4 \
-		/usr/share/info/cpp.info-5 \
-		/usr/share/info/cppinternals.info \
-		/usr/share/info/gccint.info \
-		/usr/share/info/gccint.info-1 \
-		/usr/share/info/gccint.info-2 \
-		/usr/share/info/gccint.info-3 \
-		/usr/share/info/gccint.info-4 \
-		/usr/share/info/gccint.info-5 \
-		/usr/share/info/gccint.info-6 \
-		/usr/share/info/gccint.info-7 \
-		/usr/share/info/gccint.info-8 \
-		/usr/share/info/gccint.info-9 \
-		/usr/share/info/gccint.info-10 \
-		/usr/share/info/gccint.info-11 \
-		/usr/share/info/gccint.info-12 \
-		/usr/share/info/gccint.info-13 \
-		/usr/share/info/gccint.info-14 \
-		/usr/share/info/gccint.info-15 \
-		/usr/share/info/gccint.info-16 \
-		/usr/share/info/gccint.info-17 \
-		/usr/share/info/gccint.info-18 \
-		/usr/share/info/gccint.info-19 \
-		/usr/share/info/gccint.info-20 \
-		/usr/share/info/gccint.info-21 \
-		/usr/share/info/gccint.info-22 \
-		/usr/share/info/gccint.info-23 \
-		/usr/share/info/gccint.info-24 \
-		/usr/share/info/gccint.info-25
+FAKE_FILES=	/usr/share/info/cppinternals.info \
+		/usr/share/info/gccint.info
 
 LIBIBERTY_INCLUDES=${.CURDIR}/../../lib/libiberty/include
 GNUCFLAGS=	${CFLAGS} ${COPTS} -DOPENBSD_NATIVE \
@@ -103,6 +76,7 @@ CF=
 config.status: Makefile.in configure c-parse.in
 	PATH="/bin:/usr/bin:/sbin:/usr/sbin" \
 	INSTALL_PROGRAM="${INSTALL} ${INSTALL_COPY} ${INSTALL_STRIP}" \
+	MAKEINFO='makeinfo --no-split' \
 	/bin/sh ${.CURDIR}/configure --with-gnu-as --with-gnu-ld \
 		--prefix=/usr --mandir='$$(prefix)/share/man' \
 		--with-local-prefix=/usr ${CF} \
diff --git a/gnu/lib/libiberty/Makefile.bsd-wrapper b/gnu/lib/libiberty/Makefile.bsd-wrapper
index 0222383cac2..6642f888512 100644
--- a/gnu/lib/libiberty/Makefile.bsd-wrapper
+++ b/gnu/lib/libiberty/Makefile.bsd-wrapper
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.bsd-wrapper,v 1.9 2004/09/18 20:55:16 deraadt Exp $
+#	$OpenBSD: Makefile.bsd-wrapper,v 1.10 2006/07/12 23:00:07 espie Exp $
 
 LIB=		iberty
 CPPFLAGS+=	-DHAVE_CONFIG_H -I$(.CURDIR) -I$(.CURDIR)/include -I$(.OBJDIR)
@@ -43,6 +43,7 @@ needed-list: config.status
 config.status: Makefile.in configure 
 	PATH="/bin:/usr/bin:/sbin:/usr/sbin" \
 	INSTALL_PROGRAM="${INSTALL} ${INSTALL_COPY} ${INSTALL_STRIP}" \
+	MAKEINFO='makeinfo --no-split' \
 	/bin/sh ${.CURDIR}/src/configure \
 		--prefix=/usr --with-local-prefix=/usr ${CF} \
 		&& touch config.status
diff --git a/gnu/usr.bin/binutils/Makefile.bsd-wrapper b/gnu/usr.bin/binutils/Makefile.bsd-wrapper
index f1e84a523a2..969af582b82 100644
--- a/gnu/usr.bin/binutils/Makefile.bsd-wrapper
+++ b/gnu/usr.bin/binutils/Makefile.bsd-wrapper
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.bsd-wrapper,v 1.65 2006/05/04 19:40:38 miod Exp $
+#	$OpenBSD: Makefile.bsd-wrapper,v 1.66 2006/07/12 23:00:07 espie Exp $
 
 NEW_BINUTILS=alpha amd64 arm hppa hppa64 i386 mips64 powerpc sparc sparc64
 
@@ -72,6 +72,8 @@ all:	config.status
 	    CFLAGS="${CFLAGS} ${COPTS}" LDFLAGS=${LDSTATIC} \
 	    scriptdir=${PREFIX}/libdata \
 	    tooldir=${PREFIX} \
+	    MAKEINFO='makeinfo --no-split' \
+	    MAKEINFOFLAGS='' \
 	    BSDSRCDIR=${BSDSRCDIR} \
 	    ALL_MODULES="${ALL_MODULES}" \
 	    ALL_HOST_MODULES='${ALL_HOST_MODULES}' \
@@ -92,6 +94,7 @@ CF=
 
 do-config: .USE
 	PATH="/bin:/usr/bin:/sbin:/usr/sbin" \
+	MAKEINFO='makeinfo --no-split' \
 	sh ${.CURDIR}/configure --prefix=${PREFIX} \
 	    --infodir='$${prefix}/share/info' \
 	    --disable-nls --disable-gdbtk --disable-commonbfdlib ${CF} \
diff --git a/gnu/usr.bin/cvs/Makefile.bsd-wrapper b/gnu/usr.bin/cvs/Makefile.bsd-wrapper
index fb7e762788a..be74ec7973b 100644
--- a/gnu/usr.bin/cvs/Makefile.bsd-wrapper
+++ b/gnu/usr.bin/cvs/Makefile.bsd-wrapper
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.bsd-wrapper,v 1.45 2004/06/21 16:53:59 avsm Exp $
+#	$OpenBSD: Makefile.bsd-wrapper,v 1.46 2006/07/12 23:00:07 espie Exp $
 
 .include <bsd.own.mk>
 
@@ -37,6 +37,7 @@ config: .FORCE
 	INSTALL_PROGRAM="${INSTALL} ${INSTALL_COPY} ${INSTALL_STRIP}" \
 		INSTALL_SCRIPT="${INSTALL} ${INSTALL_COPY}" \
 		ACLOCAL=true AUTOCONF=true AUTOMAKE=true AUTOHEADER=true \
+		MAKEINFO='makeinfo --no-split' \
 		sh ${.CURDIR}/configure --prefix=/usr --mandir=/usr/share/man \
 			--datadir=/usr/libdata ${KRB} ${KRB5} ${CF}
 
@@ -45,6 +46,7 @@ config.status:
 	INSTALL_PROGRAM="${INSTALL} ${INSTALL_COPY} ${INSTALL_STRIP}" \
 		INSTALL_SCRIPT="${INSTALL} ${INSTALL_COPY}" \
 		ACLOCAL=true AUTOCONF=true AUTOMAKE=true AUTOHEADER=true \
+		MAKEINFO='makeinfo --no-split' \
 		sh ${.CURDIR}/configure --prefix=/usr --mandir=/usr/share/man \
 			--datadir=/usr/libdata ${KRB} ${KRB5} ${CF}
 
diff --git a/gnu/usr.bin/gas/Makefile b/gnu/usr.bin/gas/Makefile
index 04b89d0bdf5..12112a43a9e 100644
--- a/gnu/usr.bin/gas/Makefile
+++ b/gnu/usr.bin/gas/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.7 2005/12/16 23:06:05 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.8 2006/07/12 23:00:07 espie Exp $
 #	$NetBSD: Makefile,v 1.25 1997/10/25 10:10:35 lukem Exp $
 #	@(#)Makefile	6.1 (Berkeley) 3/3/91
 TARGET_MACHINE_ARCH?=	$(MACHINE_ARCH)
@@ -83,10 +83,10 @@ MAN=	as.1
 
 all:
 	(cd ${.CURDIR}/doc; m4 pretex.m4 none.m4 all.m4 as.texinfo) > as-all.texinfo
-	makeinfo --split-size 200000 -o as.info as-all.texinfo
+	makeinfo --no-split -o as.info as-all.texinfo
 
 afterinstall: as.info
 	${INSTALL} ${INSTALL_COPY} -o ${DOCOWN} -g ${DOCGRP} -m ${DOCMODE} \
-	    as.info as.info-1 ${DESTDIR}/usr/share/info/
+	    as.info ${DESTDIR}/usr/share/info/
 
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/gcc/Makefile.bsd-wrapper b/gnu/usr.bin/gcc/Makefile.bsd-wrapper
index 31d854bdbb5..e8c9abea7e8 100644
--- a/gnu/usr.bin/gcc/Makefile.bsd-wrapper
+++ b/gnu/usr.bin/gcc/Makefile.bsd-wrapper
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.bsd-wrapper,v 1.53 2005/12/22 18:15:01 kettenis Exp $
+#	$OpenBSD: Makefile.bsd-wrapper,v 1.54 2006/07/12 23:00:07 espie Exp $
 
 MAN=		gcc.1 cpp.1 gcov.1 protoize.1
 MLINKS+=	protoize.1 unprotoize.1
@@ -15,14 +15,6 @@ MLINKS+=	g77.1 f77.1
 .endif
 V=3.3.5
 
-FAKE_FILES=/usr/share/info/g77.info-21 \
-	/usr/share/info/gcc.info-25 \
-	/usr/share/info/gcc.info-26 \
-	/usr/share/info/gcc.info-27 \
-	/usr/share/info/gcc.info-28 \
-	/usr/share/info/gcc.info-29 \
-	/usr/share/info/gcc.info-30
-
 .SUFFIXES:	.1
 .PATH.1:	${.CURDIR}/gcc ${.CURDIR}/gcc/doc
 
@@ -97,6 +89,7 @@ config.status: gcc/Makefile.in gcc/configure gcc/c-parse.in
 	PATH="${PATH}" \
 	INSTALL_PROGRAM="${INSTALL} ${INSTALL_COPY} ${INSTALL_STRIP}" \
 	CPPFLAGS=-I${LIBIBERTY_INCLUDES} \
+	MAKEINFO='makeinfo --no-split' \
 	/bin/sh ${.CURDIR}/gcc/configure --with-gnu-as --with-gnu-ld \
 		--prefix=${CONFIGPREFIX} --mandir='$$(prefix)/share/man' \
 		--with-local-prefix=/usr ${CF} \
@@ -152,9 +145,6 @@ install:	maninstall target_path
 	fi
 #	ln -fs `cat target-path`/cpp \
 #		${DESTDIR}/usr/libexec
-	for i in ${FAKE_FILES}; do \
-	    touch ${DESTDIR}$$i; \
-	done
 
 clean cleandir: 
 	-@if [ -e Makefile ]; then ${MAKE} distclean; fi
diff --git a/gnu/usr.bin/texinfo/Makefile.bsd-wrapper b/gnu/usr.bin/texinfo/Makefile.bsd-wrapper
index 74066156c2f..773b4d0bad2 100644
--- a/gnu/usr.bin/texinfo/Makefile.bsd-wrapper
+++ b/gnu/usr.bin/texinfo/Makefile.bsd-wrapper
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.bsd-wrapper,v 1.37 2003/02/16 18:28:41 deraadt Exp $
+#	$OpenBSD: Makefile.bsd-wrapper,v 1.38 2006/07/12 23:00:07 espie Exp $
 
 INFODIR=	infodir=/usr/share/info
 INFOPATH=	DEFAULT_INFOPATH=/usr/local/info:/usr/share/info:.
@@ -7,7 +7,8 @@ MAN=	doc/info.1 doc/install-info.1 doc/makeinfo.1 doc/texi2dvi.1
 MAN+= doc/texindex.1 doc/info.5 doc/texinfo.5 doc/infokey.1
 
 GNUCFLAGS=	CC="${CC}" CFLAGS="${CFLAGS} ${COPTS}" \
-	ACLOCAL=true AUTOHEADER=true AUTOCONF=true AUTOMAKE=true
+	ACLOCAL=true AUTOHEADER=true AUTOCONF=true AUTOMAKE=true \
+	MAKEINFO='makeinfo --no-split'
 
 FSFMAKE=	${MAKE} ${GNUCFLAGS} ${INFODIR} ${INFOPATH} 
 FSFALL=all-recursive
@@ -32,12 +33,14 @@ config: .FORCE
 	PATH="/bin:/usr/bin:/sbin:/usr/sbin" \
 	CFLAGS="${CFLAGS} ${COPTS}" \
 	INSTALL_PROGRAM="${INSTALL} ${INSTALL_COPY} ${INSTALL_STRIP}" \
+	MAKEINFO='makeinfo --no-split' \
 		/bin/sh ${.CURDIR}/configure --infodir=/usr/share/info --prefix=/usr --disable-nls ${CF}
 
 config.status:
 	PATH="/bin:/usr/bin:/sbin:/usr/sbin" \
 	CFLAGS="${CFLAGS} ${COPTS}" \
 	INSTALL_PROGRAM="${INSTALL} ${INSTALL_COPY} ${INSTALL_STRIP}" \
+	MAKEINFO='makeinfo --no-split' \
 		/bin/sh ${.CURDIR}/configure --infodir=/usr/share/info --prefix=/usr --disable-nls ${CF}
 
 .ifdef NOMAN
diff --git a/kerberosV/doc/Makefile b/kerberosV/doc/Makefile
index ea2a5e254be..34afd135382 100644
--- a/kerberosV/doc/Makefile
+++ b/kerberosV/doc/Makefile
@@ -1,11 +1,11 @@
-# $Id: Makefile,v 1.4 2003/08/22 13:49:33 hin Exp $
+# $Id: Makefile,v 1.5 2006/07/12 23:00:07 espie Exp $
 
 KRBDEPTH=..
 .include "../Makefile.inc"
 
 .PATH:	${KRB5SRC}/doc
 
-MAKEINFO = /usr/bin/makeinfo
+MAKEINFO = /usr/bin/makeinfo --no-split
 INSTALL-INFO = /usr/bin/install-info
 
 infodir = ${DESTDIR}/usr/share/info
diff --git a/usr.sbin/amd/doc/Makefile b/usr.sbin/amd/doc/Makefile
index 85b1e9cb1d8..636273f9c3b 100644
--- a/usr.sbin/amd/doc/Makefile
+++ b/usr.sbin/amd/doc/Makefile
@@ -1,12 +1,12 @@
-#	$OpenBSD: Makefile,v 1.6 2002/11/06 17:54:51 pvalchev Exp $
+#	$OpenBSD: Makefile,v 1.7 2006/07/12 23:00:07 espie Exp $
 
-INFO = amdref.info amdref.info-1 amdref.info-2 amdref.info-3
+INFO = amdref.info
 SRCS = amdref.texinfo
 
 all: ${INFO}
 
 ${INFO}: ${SRCS}
-	-makeinfo --no-validate ${.CURDIR}/${SRCS}
+	-makeinfo --no-validate --no-split ${.CURDIR}/${SRCS}
 
 clean cleandir:
 	-rm -f ${INFO}