o Use --defsection and --defentry options of install-info(1) instead of

  "fancy substitutions".
o Invoke install-info(1) with --quiet to automatically remove duplicate
  Info dir entries.

Reviewed by:	bde

1 files changed, 9 insertions, 10 deletions

diff --git a/share/mk/bsd.info.mk b/share/mk/bsd.info.mk
index 32f22d9..8011db2 100644
--- a/share/mk/bsd.info.mk
+++ b/share/mk/bsd.info.mk
@@ -40,11 +40,13 @@
 #
 # INFOOWN	Info owner. [${SHAREOWN}]
 #
-# INFOSECTION	??? [Miscellaneous]
+# INFOSECTION	Default section (if one could not be found in
+#		the Info file). [Miscellaneous]
 #
-# INFOTMPL	??? [${INFODIR}/dir-tmpl]
+# INSTALLINFO	A program for installing directory entries from Info
+#		file in the ${INFODIR}/${INFODIRFILE}. [install-info]
 #
-# INSTALLINFO	??? [install-info]
+# INSTALLINFOFLAGS	Options for ${INSTALLINFO} command. [--quiet]
 #
 # INSTALLINFODIRS	???
 #
@@ -87,13 +89,12 @@ MAKEINFO?=	makeinfo
 MAKEINFOFLAGS+=	--no-split # simplify some things, e.g., compression
 SRCDIR?=	${.CURDIR}
 INFODIRFILE?=   dir
-INFOTMPL?=      ${INFODIR}/dir-tmpl
 INSTALLINFO?=   install-info
+INSTALLINFOFLAGS+=--quiet
 INFOSECTION?=   Miscellaneous
 ICOMPRESS_CMD?=	${COMPRESS_CMD}
 ICOMPRESS_EXT?=	${COMPRESS_EXT}
 FORMATS?=	info
-GREP?=		grep
 INFO2HTML?=	info2html
 TEX?=		tex
 DVIPS?=		dvips
@@ -160,11 +161,9 @@ ${x:S/$/${ICOMPRESS_EXT}/}:	${x}
 .for x in ${INFO}
 INSTALLINFODIRS+= ${x:S/$/-install/}
 ${x:S/$/-install/}: ${DESTDIR}${INFODIR}/${INFODIRFILE}
-	sflag=`${GREP} -q ^INFO-DIR-SECTION ${x}.info || echo 1`; \
-	eflag=`${GREP} -q ^START-INFO-DIR-ENTRY ${x}.info || echo 1`; \
-	${INSTALLINFO} \
-	    $${sflag:+--section=${INFOSECTION}} \
-	    $${eflag:+--entry=${INFOENTRY_${x}}} \
+	${INSTALLINFO} ${INSTALLINFOFLAGS} \
+	    --defsection=${INFOSECTION} \
+	    --defentry=${INFOENTRY_${x}} \
 	    ${x}.info ${DESTDIR}${INFODIR}/${INFODIRFILE}
 .endfor