New install-info(1) correctly fails to install ENTRY for file FOO

if ENTRY already exists for file FOO2 in /usr/share/info/dir.

So, re-init /usr/share/info/dir unconditionally at installworld.
This commit is contained in:
Ruslan Ermilov 2000-01-19 19:18:50 +00:00
parent 88d739dc5f
commit 58faf4d04b
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=56296
2 changed files with 3 additions and 5 deletions

View File

@ -1,7 +1,9 @@
# @(#)Makefile 8.1 (Berkeley) 6/5/93
# $FreeBSD$
SUBDIR= colldef dict doc examples info isdn man me misc mk mklocale skel \
# Do not include `info' in the SUBDIR list, it is handled separately.
SUBDIR= colldef dict doc examples isdn man me misc mk mklocale skel \
syscons tabset termcap timedef zoneinfo
.include <bsd.subdir.mk>

View File

@ -3,8 +3,6 @@
NOOBJ= noobj
all clean cleandir depend lint tags:
beforeinstall:
.if !exists(${DESTDIR}${INFODIR})
@echo "Warning: the directory ${DESTDIR}${INFODIR} does not exist!"
@ -18,9 +16,7 @@ beforeinstall:
.endif
${INSTALL} -c -o ${INFOOWN} -g ${INFOGRP} -m ${INFOMODE} dir-tmpl \
${DESTDIR}${INFODIR}/dir-tmpl
.if !exists(${DESTDIR}${INFODIR}/dir)
${INSTALL} -c -o ${INFOOWN} -g ${INFOGRP} -m ${INFOMODE} \
dir-tmpl ${DESTDIR}${INFODIR}/dir
.endif
.include <bsd.prog.mk>