From owner-svn-src-user@FreeBSD.ORG Tue Oct 14 22:11:19 2008 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4D7CD106569A; Tue, 14 Oct 2008 22:11:19 +0000 (UTC) (envelope-from edwin@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 3C6008FC18; Tue, 14 Oct 2008 22:11:19 +0000 (UTC) (envelope-from edwin@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id m9EMBJgX017282; Tue, 14 Oct 2008 22:11:19 GMT (envelope-from edwin@svn.freebsd.org) Received: (from edwin@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id m9EMBJSY017281; Tue, 14 Oct 2008 22:11:19 GMT (envelope-from edwin@svn.freebsd.org) Message-Id: <200810142211.m9EMBJSY017281@svn.freebsd.org> From: Edwin Groothuis Date: Tue, 14 Oct 2008 22:11:19 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r183897 - user/edwin/top/top-3.8b1/usr.bin/top X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 14 Oct 2008 22:11:19 -0000 Author: edwin Date: Tue Oct 14 22:11:18 2008 New Revision: 183897 URL: http://svn.freebsd.org/changeset/base/183897 Log: Replace static filenames with .CURDIR, .TARGET and .ALLSRC on places where required. Submitted by: Modified: user/edwin/top/top-3.8b1/usr.bin/top/Makefile Modified: user/edwin/top/top-3.8b1/usr.bin/top/Makefile ============================================================================== --- user/edwin/top/top-3.8b1/usr.bin/top/Makefile Tue Oct 14 20:28:42 2008 (r183896) +++ user/edwin/top/top-3.8b1/usr.bin/top/Makefile Tue Oct 14 22:11:18 2008 (r183897) @@ -49,30 +49,32 @@ CLEANFILES+= top.local.h top.x CLEANFILES+= config.h CPU!= uname -m config.h: config.h.in - @${ECHO} Making config.h from config.h.in + @${ECHO} Making ${.TARGET} from ${.ALLSRC} sed \ -e 's/@DEFAULT_TOPN@/-1/' \ -e 's/@DEFAULT_DELAY@/2/' \ -e 's/@HAVE_GETOPT_LONG@/1/' \ -e 's/@ENABLE_KILL@/1/' \ -e "s/@CPU@/${CPU}/" \ - < config.h.in > config.h + < ${.ALLSRC} > ${.TARGET} CLEANFILES+= top.1.local top.1.local: top.1.in - @${ECHO} Making top.1.local from top.1.in + @${ECHO} Making ${.TARGET} from ${.ALLSRC} @sed \ -e 's/@DEFAULT_TOPN@/-1/' \ -e 's/@DEFAULT_DELAY@/2/' \ -e 's/@HAVE_GETOPT_LONG@/1/' \ -e 's/@ENABLE_KILL@/1/' \ - < ${TOPDIR}/top.1.in > top.1.local + < ${.ALLSRC} > ${.TARGET} CLEANFILES+= top.1 top.1: top.1.local machine.man - L=`grep -n MAN_SUPPLEMENT top.1.local | awk -F: '{ print $$1 }'`; \ - (head -`expr $$L - 1` top.1.local; \ - cat machine.man; \ - tail +`expr $$L + 1` top.1.local) > top.1 + @${ECHO} Making ${.TARGET} from ${.ALLSRC} + L=`grep -n MAN_SUPPLEMENT ${.CURDIR}/top.1.local | \ + awk -F: '{ print $$1 }'`; \ + (head -`expr $$L - 1` ${.CURDIR}/top.1.local; \ + cat ${.CURDIR}/machine.man; \ + tail +`expr $$L + 1` ${.CURDIR}/top.1.local) > ${.TARGET} .include