conf/127471: installworld fails if install-info is missing (WITHOUT_INFO=yes)

[Bertrand Yvain]

>Number:         127471
>Category:       conf
>Synopsis:       installworld fails if install-info is missing (WITHOUT_INFO=yes)
>Confidential:   no
>Severity:       serious
>Priority:       low
>Responsible:    freebsd-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Thu Sep 18 15:00:10 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator:     Bertrand Yvain
>Release:        RELENG_7
>Organization:
IELO
>Environment:
FreeBSD hithlum.adm.ielo.net 7.1-PRERELEASE FreeBSD 7.1-PRERELEASE #0: Thu Sep 18 12:33:56 CEST 2008     pnl at hithlum.adm.ielo.net:/usr/obj/usr/src/sys/GENERIC  i386

>Description:
When using WITHOUT_INFO=yes in src.conf, install-info is removed by make delete-old.

Without this file, make installworld fails around line 597 of src/Makefile.inc1,v 1.588.2.9:

distributeworld installworld: installcheck
        mkdir -p ${INSTALLTMP}
        for prog in [ awk cap_mkdb cat chflags chmod chown \
            date echo egrep find grep install-info \
            ln lockf make mkdir mtree mv pwd_mkdb rm sed sh sysctl \
            test true uname wc zic; do \
                cp `which $$prog` ${INSTALLTMP}; \
        done
        ${_+_}cd ${.CURDIR}; ${IMAKE} re${.TARGET:S/world$//}
        rm -rf ${INSTALLTMP}

>How-To-Repeat:
rm /usr/bin/install-info && make installworld
>Fix:
For instance, one could make every program in this loop optional.
See patch file for a suggested fix.

Patch attached with submission follows:

--- Makefile.inc1.orig	2008-09-18 16:40:33.000000000 +0200
+++ Makefile.inc1	2008-09-18 16:46:13.000000000 +0200
@@ -596,10 +596,10 @@
 #
 distributeworld installworld: installcheck
 	mkdir -p ${INSTALLTMP}
-	for prog in [ awk cap_mkdb cat chflags chmod chown \
+	which [ awk cap_mkdb cat chflags chmod chown \
 	    date echo egrep find grep install-info \
 	    ln lockf make mkdir mtree mv pwd_mkdb rm sed sh sysctl \
-	    test true uname wc zic; do \
+	    test true uname wc zic | while read prog; do \
 		cp `which $$prog` ${INSTALLTMP}; \
 	done
 	${_+_}cd ${.CURDIR}; ${IMAKE} re${.TARGET:S/world$//}


>Release-Note:
>Audit-Trail:
>Unformatted: