Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 2 Jan 2015 22:55:31 +0000 (UTC)
From:      Garrett Cooper <ngie@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r276592 - head/share/mk
Message-ID:  <201501022255.t02MtVnb007910@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
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} \



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