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
This commit is contained in:
parent
cda5a90f00
commit
a342f0f67c
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=56537
@ -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
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user