From owner-svn-src-all@FreeBSD.ORG Fri Jan 2 22:55:31 2015 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id C61E1AF5; Fri, 2 Jan 2015 22:55:31 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B20801652; Fri, 2 Jan 2015 22:55:31 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t02MtVtY007911; Fri, 2 Jan 2015 22:55:31 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t02MtVnb007910; Fri, 2 Jan 2015 22:55:31 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201501022255.t02MtVnb007910@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Fri, 2 Jan 2015 22:55:31 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r276592 - head/share/mk X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 02 Jan 2015 22:55:31 -0000 Author: ngie Date: Fri Jan 2 22:55:30 2015 New Revision: 276592 URL: https://svnweb.freebsd.org/changeset/base/276592 Log: Remove MK_INFO guards in bsd.info.mk per r276556 As a side-effect now info pages will always be built/installed if MK_INFO == yes, whereas before their presence was conditional based on the value of MK_INFO This .mk file might be removed in the future, pending discussion on -arch. For now unbreak its use outside of src (with the only use in ports according to bapt being devel/cvs*) X-MFC with: r276551, r276556 Reviewed by: bapt Differential Revision: D1413 Modified: head/share/mk/bsd.info.mk Modified: head/share/mk/bsd.info.mk ============================================================================== --- head/share/mk/bsd.info.mk Fri Jan 2 22:53:03 2015 (r276591) +++ head/share/mk/bsd.info.mk Fri Jan 2 22:55:30 2015 (r276592) @@ -121,7 +121,6 @@ DVIPS2ASCII?= dvips2ascii IFILENS+= ${INFO:S/$/.${_f}/} .endfor -.if ${MK_INFO} != "no" CLEANFILES+= ${IFILENS} .if !defined(NO_INFOCOMPRESS) CLEANFILES+= ${IFILENS:S/$/${ICOMPRESS_EXT}/} @@ -131,9 +130,6 @@ all: ${IFILES} IFILES= ${IFILENS} all: ${IFILES} .endif -.else -all: -.endif .for x in ${IFILENS} ${x:S/$/${ICOMPRESS_EXT}/}: ${x} @@ -177,7 +173,7 @@ CLEANFILES+= ${INFO:S/$/-la.texi/} CLEANFILES+= ${INFO:S/$/.info.*.html/} ${INFO:S/$/.info/} .endif -.if ${MK_INFO} != "no" && defined(INFO) +.if defined(INFO) install: ${INSTALLINFODIRS} .if !empty(IFILES:N*.html) ${INSTALL} -o ${INFOOWN} -g ${INFOGRP} -m ${INFOMODE} \