summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormarkm <markm@FreeBSD.org>1999-01-20 05:48:19 +0000
committermarkm <markm@FreeBSD.org>1999-01-20 05:48:19 +0000
commit0b91534f2d2280f6af9d8d1f3067a9540ea4ffcc (patch)
treebd3e5b52927c6fa0ec42c63711154f203c8f61f2
parentd0481c5c743a79963542984ba5d62d01cc99fa76 (diff)
downloadFreeBSD-src-0b91534f2d2280f6af9d8d1f3067a9540ea4ffcc.zip
FreeBSD-src-0b91534f2d2280f6af9d8d1f3067a9540ea4ffcc.tar.gz
Texinfo has been upgraded. This needs to catch up.
Submitted by: lkoeller@cc.fh-lippe.de
-rw-r--r--share/mk/bsd.info.mk25
1 files changed, 21 insertions, 4 deletions
diff --git a/share/mk/bsd.info.mk b/share/mk/bsd.info.mk
index b10a30d..b84ad64 100644
--- a/share/mk/bsd.info.mk
+++ b/share/mk/bsd.info.mk
@@ -1,4 +1,4 @@
-# $Id: bsd.info.mk,v 1.51 1998/08/08 07:02:07 peter Exp $
+# $Id: bsd.info.mk,v 1.52 1999/01/14 20:02:41 markm Exp $
#
# The include file <bsd.info.mk> handles installing GNU (tech)info files.
# Texinfo is a documentation system that uses a single source
@@ -93,6 +93,7 @@ INFOSECTION?= Miscellaneous
ICOMPRESS_CMD?= ${COMPRESS_CMD}
ICOMPRESS_EXT?= ${COMPRESS_EXT}
FORMATS?= info
+GREP?= grep
INFO2HTML?= info2html
TEX?= tex
DVIPS?= dvips
@@ -159,9 +160,25 @@ ${x:S/$/${ICOMPRESS_EXT}/}: ${x}
.for x in ${INFO}
INSTALLINFODIRS+= ${x:S/$/-install/}
${x:S/$/-install/}: ${DESTDIR}${INFODIR}/${INFODIRFILE}
- ${INSTALLINFO} --section=${INFOSECTION} \
- --entry=${INFOENTRY_${x}} \
- ${x}.info ${DESTDIR}${INFODIR}/${INFODIRFILE}
+ -__section=`${GREP} "^INFO-DIR-SECTION" ${x}.info`; \
+ -__entry=`${GREP} "^START-INFO-DIR-ENTRY" ${x}.info`; \
+ if [ ! -z "$$__section" ]; then \
+ if [ ! -z "$$__entry" ]; then \
+ ${INSTALLINFO} ${x}.info ${DESTDIR}${INFODIR}/${INFODIRFILE}; \
+ else \
+ ${INSTALLINFO} --entry=${INFOENTRY_${x}} \
+ ${x}.info ${DESTDIR}${INFODIR}/${INFODIRFILE}; \
+ fi \
+ else \
+ if [ ! -z "$$__entry" ]; then \
+ ${INSTALLINFO} --section=${INFOSECTION} \
+ ${x}.info ${DESTDIR}${INFODIR}/${INFODIRFILE}; \
+ else \
+ ${INSTALLINFO} --section=${INFOSECTION} \
+ --entry=${INFOENTRY_${x}} \
+ ${x}.info ${DESTDIR}${INFODIR}/${INFODIRFILE}; \
+ fi \
+ fi
.endfor
.PHONY: ${INSTALLINFODIRS}
OpenPOWER on IntegriCloud