From owner-svn-src-user@FreeBSD.ORG Wed Oct 15 00:54:58 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 72FCB1065694; Wed, 15 Oct 2008 00:54:58 +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 61A158FC1E; Wed, 15 Oct 2008 00:54:58 +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 m9F0swEn020129; Wed, 15 Oct 2008 00:54:58 GMT (envelope-from edwin@svn.freebsd.org) Received: (from edwin@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id m9F0swE6020128; Wed, 15 Oct 2008 00:54:58 GMT (envelope-from edwin@svn.freebsd.org) Message-Id: <200810150054.m9F0swE6020128@svn.freebsd.org> From: Edwin Groothuis Date: Wed, 15 Oct 2008 00:54:58 +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: r183900 - 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: Wed, 15 Oct 2008 00:54:58 -0000 Author: edwin Date: Wed Oct 15 00:54:57 2008 New Revision: 183900 URL: http://svn.freebsd.org/changeset/base/183900 Log: Replace .CURDIR -> .OBJDIR on files I generate locally. 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 23:51:30 2008 (r183899) +++ user/edwin/top/top-3.8b1/usr.bin/top/Makefile Wed Oct 15 00:54:57 2008 (r183900) @@ -49,7 +49,7 @@ CLEANFILES+= top.local.h top.x CLEANFILES+= config.h CPU!= uname -m config.h: config.h.in - @${ECHO} Making ${.TARGET} from ${.ALLSRC} + @${ECHO} Making ${.TARGET} from ${.ALLSRC:T} sed \ -e 's/@DEFAULT_TOPN@/-1/' \ -e 's/@DEFAULT_DELAY@/2/' \ @@ -60,7 +60,7 @@ config.h: config.h.in CLEANFILES+= top.1.local top.1.local: top.1.in - @${ECHO} Making ${.TARGET} from ${.ALLSRC} + @${ECHO} Making ${.TARGET} from ${.ALLSRC:T} @sed \ -e 's/@DEFAULT_TOPN@/-1/' \ -e 's/@DEFAULT_DELAY@/2/' \ @@ -70,11 +70,11 @@ top.1.local: top.1.in CLEANFILES+= top.1 top.1: top.1.local machine.man - @${ECHO} Making ${.TARGET} from ${.ALLSRC} - L=`grep -n MAN_SUPPLEMENT ${.CURDIR}/top.1.local | \ + @${ECHO} Making ${.TARGET} from ${.ALLSRC:T} + L=`grep -n MAN_SUPPLEMENT ${.OBJDIR}/top.1.local | \ awk -F: '{ print $$1 }'`; \ - (head -`expr $$L - 1` ${.CURDIR}/top.1.local; \ + (head -`expr $$L - 1` ${.OBJDIR}/top.1.local; \ cat ${.CURDIR}/machine.man; \ - tail +`expr $$L + 1` ${.CURDIR}/top.1.local) > ${.TARGET} + tail +`expr $$L + 1` ${.OBJDIR}/top.1.local) > ${.TARGET} .include