From owner-svn-src-stable-10@FreeBSD.ORG Mon Feb 2 04:54:44 2015 Return-Path: Delivered-To: svn-src-stable-10@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 6ECCBED5; Mon, 2 Feb 2015 04:54:44 +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 5AE3F917; Mon, 2 Feb 2015 04:54:44 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t124si1C027588; Mon, 2 Feb 2015 04:54:44 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t124siA9027587; Mon, 2 Feb 2015 04:54:44 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201502020454.t124siA9027587@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Mon, 2 Feb 2015 04:54:44 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r278051 - stable/10/usr.bin/grep X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-10@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 02 Feb 2015 04:54:44 -0000 Author: ngie Date: Mon Feb 2 04:54:43 2015 New Revision: 278051 URL: https://svnweb.freebsd.org/changeset/base/278051 Log: MFC r277939: r277939 (by ngie): Create MANLINKS for lzgrep, etc when MK_LZMA_SUPPORT != no Sponsored by: EMC / Isilon Storage Division Modified: stable/10/usr.bin/grep/Makefile Directory Properties: stable/10/ (props changed) Modified: stable/10/usr.bin/grep/Makefile ============================================================================== --- stable/10/usr.bin/grep/Makefile Mon Feb 2 03:45:02 2015 (r278050) +++ stable/10/usr.bin/grep/Makefile Mon Feb 2 04:54:43 2015 (r278051) @@ -31,13 +31,7 @@ MLINKS= grep.1 egrep.1 \ grep.1 fgrep.1 \ grep.1 zgrep.1 \ grep.1 zegrep.1 \ - grep.1 zfgrep.1 \ - grep.1 xzgrep.1 \ - grep.1 xzegrep.1 \ - grep.1 xzfgrep.1 \ - grep.1 lzgrep.1 \ - grep.1 lzegrep.1 \ - grep.1 lzfgrep.1 + grep.1 zfgrep.1 .endif LDADD= -lz @@ -53,6 +47,13 @@ LINKS+= ${BINDIR}/${PROG} ${BINDIR}/xzgr ${BINDIR}/${PROG} ${BINDIR}/lzgrep \ ${BINDIR}/${PROG} ${BINDIR}/lzegrep \ ${BINDIR}/${PROG} ${BINDIR}/lzfgrep + +MLINKS+= grep.1 xzgrep.1 \ + grep.1 xzegrep.1 \ + grep.1 xzfgrep.1 \ + grep.1 lzgrep.1 \ + grep.1 lzegrep.1 \ + grep.1 lzfgrep.1 .else CFLAGS+= -DWITHOUT_LZMA .endif