Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 5 Apr 2009 00:51:59 +0000 (UTC)
From:      Ruslan Ermilov <ru@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
Subject:   svn commit: r190707 - stable/7
Message-ID:  <200904050051.n350pxtS088818@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: ru
Date: Sun Apr  5 00:51:59 2009
New Revision: 190707
URL: http://svn.freebsd.org/changeset/base/190707

Log:
  MFC: Don't put "install-info" to the list of install-tools if we're
  installing with -DWITHOUT_INFO.
  
  Approved by:	re (kib)

Modified:
  stable/7/Makefile.inc1   (contents, props changed)

Modified: stable/7/Makefile.inc1
==============================================================================
--- stable/7/Makefile.inc1	Sun Apr  5 00:24:49 2009	(r190706)
+++ stable/7/Makefile.inc1	Sun Apr  5 00:51:59 2009	(r190707)
@@ -597,10 +597,14 @@ installcheck_UGID:
 #
 # Installs everything compiled by a 'buildworld'.
 #
+.if ${MK_INFO} != "no"
+_install-info=	install-info
+.endif
+
 distributeworld installworld: installcheck
 	mkdir -p ${INSTALLTMP}
 	for prog in [ awk cap_mkdb cat chflags chmod chown \
-	    date echo egrep find grep install-info \
+	    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}; \



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200904050051.n350pxtS088818>