From 58faf4d04b67c7115ff3208b2fbc3b55a86b2878 Mon Sep 17 00:00:00 2001
From: Ruslan Ermilov <ru@FreeBSD.org>
Date: Wed, 19 Jan 2000 19:18:50 +0000
Subject: [PATCH] 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.
---
 share/Makefile      | 4 +++-
 share/info/Makefile | 4 ----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/share/Makefile b/share/Makefile
index f7f5ef1f9159..fa7c5f9048fa 100644
--- a/share/Makefile
+++ b/share/Makefile
@@ -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>
diff --git a/share/info/Makefile b/share/info/Makefile
index 7502e3ab5615..f4ac782c653c 100644
--- a/share/info/Makefile
+++ b/share/info/Makefile
@@ -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>