makeinfo --no-split, simplifies sets immensely.

Approved deraadt@, kettenis@

1 files changed, 2 insertions, 12 deletions

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