Fix INFO_FILES definitions to match the commands in bsd.pkg.mk

17 files changed, 35 insertions, 36 deletions

diff --git a/archivers/gcpio/Makefile b/archivers/gcpio/Makefile
index 553664eaeb2..043ead23bac 100644
--- a/archivers/gcpio/Makefile
+++ b/archivers/gcpio/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 1998/04/18 17:13:05 frueauf Exp $
+# $NetBSD: Makefile,v 1.6 1998/04/22 11:05:01 agc Exp $
 #
 
 DISTNAME=       cpio-2.4.2
@@ -13,6 +13,6 @@ CONFIGURE_ARGS= --program-prefix=g
 LDFLAGS=	-lgnumalloc
 
 MAN1=		gcpio.1
-INFO_FILES=	cpio
+INFO_FILES=	cpio.info
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/rplay/Makefile b/audio/rplay/Makefile
index 9de33ea8033..ce107eb0cf6 100644
--- a/audio/rplay/Makefile
+++ b/audio/rplay/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 1998/04/17 09:37:22 agc Exp $
+# $NetBSD: Makefile,v 1.8 1998/04/22 11:05:02 agc Exp $
 # FreeBSD Id: Makefile,v 1.8 1997/06/13 16:17:01 ache Exp
 #
 
@@ -18,7 +18,7 @@ CONFIGURE_ENV+=        LDFLAGS=-L${PREFIX}/lib # XXX
 #USE_GMAKE=	yes
 MAN1=           rplay.1 xrplay.1 rplayd.1 rptp.1
 MAN5=		rplay.conf.5 rplay.hosts.5 rplay.servers.5
-INFO_FILES=	RPTP RPLAY rplay librplay
+INFO_FILES=	RPTP.info RPLAY.info rplay.info librplay.info
 
 pre-configure:
 	for f in `find ${WRKDIR} -type f -print|xargs $[GREP} -l '/usr/local'`; do \
diff --git a/audio/tracker/Makefile b/audio/tracker/Makefile
index adcaf7944bf..40612940d18 100644
--- a/audio/tracker/Makefile
+++ b/audio/tracker/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 1998/04/20 11:56:20 frueauf Exp $
+# $NetBSD: Makefile,v 1.10 1998/04/22 11:05:02 agc Exp $
 # FreeBSD Id: Makefile,v 1.29 1996/12/20 23:46:22 ache Exp 
 #
 
@@ -18,7 +18,7 @@ MAKE_FLAGS=		MACHINE=netbsd CC=${CC} INSTALL="${INSTALL}" \
 		INST_MAN_OPT="-c -m 644 -o ${BINOWN} -g ${BINGRP}" \
 		COMPRESSION_FILE=${PREFIX}/etc/compression_methods -f
 
-INFO_FILES=		tracker
+INFO_FILES=		tracker.info
 
 pre-install:
 	cd ${WRKSRC}/Docs && \
diff --git a/databases/gdbm/Makefile b/databases/gdbm/Makefile
index a55f4af04a1..2e13e1794cf 100644
--- a/databases/gdbm/Makefile
+++ b/databases/gdbm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 1998/04/17 09:37:22 agc Exp $
+# $NetBSD: Makefile,v 1.6 1998/04/22 11:05:02 agc Exp $
 # FreeBSD Id: Makefile,v 1.4 1997/01/28 08:11:23 asami Exp 
 #
 
@@ -11,7 +11,7 @@ MAINTAINER=        bjn@visi.com
 GNU_CONFIGURE=     yes
 MAKE_FLAGS=        CFLAGS="${CFLAGS}" LDFLAGS=-s -f
 MAN3=		   gdbm.3
-INFO_FILES=	   gdbm
+INFO_FILES=	   gdbm.info
 
 post-build:
 	cd ${WRKSRC} ; ${RM} gdbm.info ; make gdbm.info
diff --git a/devel/autoconf/Makefile b/devel/autoconf/Makefile
index b659ebc06af..6d7f7ccf0d2 100644
--- a/devel/autoconf/Makefile
+++ b/devel/autoconf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 1998/04/17 09:37:22 agc Exp $
+# $NetBSD: Makefile,v 1.15 1998/04/22 11:05:02 agc Exp $
 # FreeBSD Id: Makefile,v 1.12 1997/06/13 20:00:47 max Exp
 #
 
@@ -14,6 +14,6 @@ USE_PERL5=	yes
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV+=	M4=${PREFIX}/bin/gm4
-INFO_FILES=	autoconf standards
+INFO_FILES=	autoconf.info standards.info
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/bison/Makefile b/devel/bison/Makefile
index 0178b416fce..3d46795649e 100644
--- a/devel/bison/Makefile
+++ b/devel/bison/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 1998/04/17 09:37:23 agc Exp $
+# $NetBSD: Makefile,v 1.5 1998/04/22 11:05:02 agc Exp $
 
 DISTNAME=	bison-1.25
 CATEGORIES=	devel
@@ -8,6 +8,6 @@ MAINTAINER=	thorpej@netbsd.org
 
 GNU_CONFIGURE=	yes
 MAN1=		bison.1
-INFO_FILES=	bison
+INFO_FILES=	bison.info
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/cvs/Makefile b/devel/cvs/Makefile
index be572ac3fc4..79b86786bff 100644
--- a/devel/cvs/Makefile
+++ b/devel/cvs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 1998/04/17 09:37:23 agc Exp $
+# $NetBSD: Makefile,v 1.10 1998/04/22 11:05:02 agc Exp $
 #
 
 DISTNAME=       cvs-1.9
@@ -18,7 +18,7 @@ MAKE_ENV+=	INSTALL_SCRIPT="${INSTALL_SCRIPT}"
 MAN1=		cvs.1
 MAN5=		cvs.5
 MAN8=		cvsbug.8
-INFO_FILES=	cvs cvsclient
+INFO_FILES=	cvs.info cvsclient.info
 
 post-install:
 	${RM} -f ${PREFIX}/bin/cvs
diff --git a/devel/gindent/Makefile b/devel/gindent/Makefile
index a4dfcabbc04..828086bcaa2 100644
--- a/devel/gindent/Makefile
+++ b/devel/gindent/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 1998/04/17 09:37:23 agc Exp $
+# $NetBSD: Makefile,v 1.9 1998/04/22 11:05:03 agc Exp $
 # FreeBSD Id: Makefile,v 1.1.1.1 1997/08/29 09:20:00 obrien Exp
 #
 
@@ -11,7 +11,7 @@ MAINTAINER=	kchowksey@hss.hns.com
 GNU_CONFIGURE=	yes
 
 MAN1=		indent.1
-INFO_FILES=	indent
+INFO_FILES=	indent.info
 
 MAKEFILE=	makefile
 
diff --git a/devel/libg++/Makefile b/devel/libg++/Makefile
index 4265f6938f5..30b0a42091f 100644
--- a/devel/libg++/Makefile
+++ b/devel/libg++/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 1998/04/17 09:37:23 agc Exp $
+# $NetBSD: Makefile,v 1.5 1998/04/22 11:05:03 agc Exp $
 #
 
 GXXVERSION=	2.8.1.1a	# used by internal Makefile
@@ -14,7 +14,7 @@ MAKE_ENV+=	GXXVERSION="${GXXVERSION}"
 PLIST_SRC=	${WRKSRC}/.PLIST
 
 MAN1=		gperf.1
-INFO_FILES=	gperf libg++
+INFO_FILES=	gperf.info libg++.info
 
 do-configure:
 	@${CP} ${FILESDIR}/Makefile ${WRKSRC}
diff --git a/devel/m4/Makefile b/devel/m4/Makefile
index 50634fc4650..b66b0fac8a1 100644
--- a/devel/m4/Makefile
+++ b/devel/m4/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 1998/04/17 09:37:23 agc Exp $
+# $NetBSD: Makefile,v 1.9 1998/04/22 11:05:03 agc Exp $
 # FreeBSD Id: Makefile,v 1.7 1997/06/16 08:22:35 max Exp
 #
 
@@ -10,7 +10,7 @@ MAINTAINER=	packages@netbsd.org
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS= --program-prefix=g
-INFO_FILES=	m4
+INFO_FILES=	m4.info
 
 post-install:
 	@${MKDIR} ${PREFIX}/share/examples/gm4
diff --git a/misc/git/Makefile b/misc/git/Makefile
index 4b7aa587525..df048fe54d3 100644
--- a/misc/git/Makefile
+++ b/misc/git/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 1998/04/17 09:37:24 agc Exp $
+# $NetBSD: Makefile,v 1.10 1998/04/22 11:05:03 agc Exp $
 # FreeBSD Id: Makefile,v 1.8 1996/11/21 11:54:39 asami Exp
 #
 
@@ -12,7 +12,7 @@ GNU_CONFIGURE=	YES
 CONFIGURE_ARGS+=	${MACHINE_ARCH}--netbsd
 MAN1=		git.1 gitaction.1 gitkeys.1 gitmount.1 gitps.1 gitrgrep.1 \
 		gitunpack.1 gitview.1
-INFO_FILES=	git
+INFO_FILES=	git.info
 
 pre-install:
 	(cd ${WRKSRC}/info ; ${MAKE} info )
diff --git a/misc/screen/Makefile b/misc/screen/Makefile
index fbab3a0a045..09feeb18f57 100644
--- a/misc/screen/Makefile
+++ b/misc/screen/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 1998/04/17 09:37:24 agc Exp $
+# $NetBSD: Makefile,v 1.9 1998/04/22 11:05:03 agc Exp $
 # FreeBSD Id: Makefile,v 1.17 1997/06/16 06:39:51 max Exp
 #
 
@@ -11,7 +11,7 @@ MAINTAINER=	hubertf@netbsd.org
 
 GNU_CONFIGURE=	yes
 MAN1=		screen.1
-INFO_FILES=	screen
+INFO_FILES=	screen.info
 
 post-install:
 	@${MKDIR} ${PREFIX}/share/examples/screen
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk
index b98cfcbfbfa..9ab2b7cd029 100644
--- a/mk/bsd.pkg.mk
+++ b/mk/bsd.pkg.mk
@@ -1,7 +1,7 @@
 #-*- mode: Fundamental; tab-width: 4; -*-
 # ex:ts=4
 #
-#	$NetBSD: bsd.pkg.mk,v 1.71 1998/04/22 09:51:01 hubertf Exp $
+#	$NetBSD: bsd.pkg.mk,v 1.72 1998/04/22 11:05:03 agc Exp $
 #
 #	This file is derived from bsd.port.mk - 940820 Jordan K. Hubbard.
 #	This file is in the public domain.
@@ -1219,8 +1219,8 @@ do-build:
 do-install:
 	@(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} ${MAKEFILE} ${INSTALL_TARGET})
 	@for f in ${INFO_FILES}; do		\
-		${ECHO} "install-info --info-dir=${LOCALBASE}/info ${PREFIX}/info/$$f";	\
-		install-info --info-dir=${LOCALBASE}/info ${PREFIX}/info/$$f;			\
+		${ECHO} "${LOCALBASE}/bin/install-info --info-dir=${PREFIX}/info ${PREFIX}/info/$$f";	\
+		${LOCALBASE}/bin/install-info --info-dir=${PREFIX}/info ${PREFIX}/info/$$f;		\
 	done
 .endif
 
diff --git a/net/wget/Makefile b/net/wget/Makefile
index 3d852db8715..593a58fa9e7 100644
--- a/net/wget/Makefile
+++ b/net/wget/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 1998/04/20 11:56:30 frueauf Exp $
+# $NetBSD: Makefile,v 1.7 1998/04/22 11:05:04 agc Exp $
 # FreeBSD Id: Makefile,v 1.4 1997/05/22 07:53:29 tg Exp
 #
 
@@ -10,6 +10,6 @@ MAINTAINER=	packages@netbsd.org
 
 GNU_CONFIGURE=	yes
 MAN1=		wget.1
-INFO_FILES=	wget
+INFO_FILES=	wget.info
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/teTeX/Makefile b/print/teTeX/Makefile
index 226552bc58d..cf6868f501d 100644
--- a/print/teTeX/Makefile
+++ b/print/teTeX/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 1998/04/17 09:37:25 agc Exp $
+# $NetBSD: Makefile,v 1.9 1998/04/22 11:05:04 agc Exp $
 # FreeBSD Id: Makefile,v 1.20 1997/08/05 06:56:41 tg Exp
 #
 
@@ -28,7 +28,7 @@ MAN1=		afm2tfm.1 allcm.1 alldc.1 allneeded.1 amslatex.1 \
 		tangle.1 tex.1 texconfig.1 texhash.1 tftopl.1 \
 		vftovp.1 virtex.1 vptovf.1 weave.1 xdvi.1
 MAN5=		ls-R.5
-INFO_FILES=	kpathsea dvips fontname
+INFO_FILES=	latex kpathsea.info dvips.info fontname.info
 
 TETEX_SRC=	teTeX-src-0.4pl7.tar.gz
 TETEX_LIB=	teTeX-lib-0.4pl8.tar.gz
@@ -46,7 +46,6 @@ pre-install:
 	@${INSTALL_DATA} ${WRKLIB}/texmf.cnf ${PREFIX}/share/texmf/web2c
 
 post-install:
-	${PREFIX}/bin/install-info ${PREFIX}/info/latex ${PREFIX}/info/dir
 	@chown -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/texmf
 	@find ${PREFIX}/share/texmf/fonts/pk ${PREFIX}/share/texmf/fonts/tfm \
 		-type d -print | xargs chmod 1777
diff --git a/shells/zsh/Makefile b/shells/zsh/Makefile
index 4b83365a492..ac2caa596d9 100644
--- a/shells/zsh/Makefile
+++ b/shells/zsh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 1998/04/20 11:56:33 frueauf Exp $
+# $NetBSD: Makefile,v 1.9 1998/04/22 11:05:04 agc Exp $
 # FreeBSD Id: Makefile,v 1.26 1997/09/26 08:23:14 torstenb Exp
 #
 
@@ -19,7 +19,7 @@ MAINTAINER=	packages@netbsd.org
 GNU_CONFIGURE=	yes
 MAN1=		zsh.1 zshbuiltins.1 zshcompctl.1 zshexpn.1 zshmisc.1 \
 		zshoptions.1 zshall.1 zshparam.1 zshzle.1
-INFO_FILES=	zsh
+INFO_FILES=	zsh.info
 
 # If you want to build a static binary, uncomment the following line
 #LDFLAGS+=-static
diff --git a/sysutils/mtools/Makefile b/sysutils/mtools/Makefile
index fb2f80acf4b..165dbe06b82 100644
--- a/sysutils/mtools/Makefile
+++ b/sysutils/mtools/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 1998/04/17 09:37:25 agc Exp $
+# $NetBSD: Makefile,v 1.8 1998/04/22 11:05:04 agc Exp $
 #
 
 DISTNAME=	mtools-3.8
@@ -17,6 +17,6 @@ MAN1=		mattrib.1 mbadblocks.1 mcd.1 mcopy.1 mdel.1 mdeltree.1 mdir.1 \
 		mread.1 mren.1 mtoolstest.1 mtools.1 mtype.1 mwrite.1 mzip.1
 
 MAN5=		mtools.5
-INFO_FILES=	mtools
+INFO_FILES=	mtools.info
 
 .include "../../mk/bsd.pkg.mk"