From owner-svn-src-head@freebsd.org Wed Mar 1 05:14:47 2017 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id D1087CF21C4; Wed, 1 Mar 2017 05:14:47 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 9C2D81212; Wed, 1 Mar 2017 05:14:47 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v215EkMt038488; Wed, 1 Mar 2017 05:14:46 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v215EjLc038475; Wed, 1 Mar 2017 05:14:45 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201703010514.v215EjLc038475@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Ngie Cooper Date: Wed, 1 Mar 2017 05:14:45 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314475 - in head/usr.sbin/lpr: chkprintcap filters filters.ru/koi2855 filters.ru/koi2alt lpc lpd lpq lpr lprm lptest pac X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Mar 2017 05:14:48 -0000 Author: ngie Date: Wed Mar 1 05:14:45 2017 New Revision: 314475 URL: https://svnweb.freebsd.org/changeset/base/314475 Log: Simplify idioms in usr.sbin/lpr Makefiles Use :H instead of .CURDIR-relative pathing to simplify make output, etc. MFC after: 1 week Sponsored by: Dell EMC Isilon Modified: head/usr.sbin/lpr/chkprintcap/Makefile head/usr.sbin/lpr/filters.ru/koi2855/Makefile head/usr.sbin/lpr/filters.ru/koi2alt/Makefile head/usr.sbin/lpr/filters/Makefile head/usr.sbin/lpr/lpc/Makefile head/usr.sbin/lpr/lpd/Makefile head/usr.sbin/lpr/lpq/Makefile head/usr.sbin/lpr/lpr/Makefile head/usr.sbin/lpr/lprm/Makefile head/usr.sbin/lpr/lptest/Makefile head/usr.sbin/lpr/pac/Makefile Modified: head/usr.sbin/lpr/chkprintcap/Makefile ============================================================================== --- head/usr.sbin/lpr/chkprintcap/Makefile Wed Mar 1 05:06:21 2017 (r314474) +++ head/usr.sbin/lpr/chkprintcap/Makefile Wed Mar 1 05:14:45 2017 (r314475) @@ -1,12 +1,12 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../common_source +.PATH: ${.CURDIR:H}/common_source PROG= chkprintcap MAN= chkprintcap.8 SRCS= chkprintcap.c skimprintcap.c -CFLAGS+= -I${.CURDIR}/../common_source +CFLAGS+= -I${.CURDIR:H}/common_source LIBADD= lpr Modified: head/usr.sbin/lpr/filters.ru/koi2855/Makefile ============================================================================== --- head/usr.sbin/lpr/filters.ru/koi2855/Makefile Wed Mar 1 05:06:21 2017 (r314474) +++ head/usr.sbin/lpr/filters.ru/koi2855/Makefile Wed Mar 1 05:14:45 2017 (r314475) @@ -3,6 +3,6 @@ PROG= koi2855 MAN= -CFLAGS+= -I${.CURDIR}/../../common_source +CFLAGS+= -I${.CURDIR:H:H}/common_source .include Modified: head/usr.sbin/lpr/filters.ru/koi2alt/Makefile ============================================================================== --- head/usr.sbin/lpr/filters.ru/koi2alt/Makefile Wed Mar 1 05:06:21 2017 (r314474) +++ head/usr.sbin/lpr/filters.ru/koi2alt/Makefile Wed Mar 1 05:14:45 2017 (r314475) @@ -3,6 +3,6 @@ PROG= koi2alt MAN= -CFLAGS+= -I${.CURDIR}/../../common_source +CFLAGS+= -I${.CURDIR:H:H}/common_source .include Modified: head/usr.sbin/lpr/filters/Makefile ============================================================================== --- head/usr.sbin/lpr/filters/Makefile Wed Mar 1 05:06:21 2017 (r314474) +++ head/usr.sbin/lpr/filters/Makefile Wed Mar 1 05:14:45 2017 (r314475) @@ -6,6 +6,6 @@ BINDIR= ${LIBEXECDIR}/lpr PROG= lpf MAN= -CFLAGS+= -I${.CURDIR}/../common_source +CFLAGS+= -I${.CURDIR:H}/common_source .include Modified: head/usr.sbin/lpr/lpc/Makefile ============================================================================== --- head/usr.sbin/lpr/lpc/Makefile Wed Mar 1 05:06:21 2017 (r314474) +++ head/usr.sbin/lpr/lpc/Makefile Wed Mar 1 05:14:45 2017 (r314475) @@ -1,7 +1,7 @@ # From: @(#)Makefile 8.1 (Berkeley) 6/6/93 # $FreeBSD$ -.PATH: ${.CURDIR}/../common_source +.PATH: ${.CURDIR:H}/common_source PROG= lpc MAN= lpc.8 @@ -9,7 +9,7 @@ SRCS= lpc.c cmds.c cmdtab.c movejobs.c BINGRP= daemon BINMODE= 2555 -CFLAGS+= -I${.CURDIR}/../common_source +CFLAGS+= -I${.CURDIR:H}/common_source WARNS?= 0 Modified: head/usr.sbin/lpr/lpd/Makefile ============================================================================== --- head/usr.sbin/lpr/lpd/Makefile Wed Mar 1 05:06:21 2017 (r314474) +++ head/usr.sbin/lpr/lpd/Makefile Wed Mar 1 05:14:45 2017 (r314475) @@ -5,7 +5,7 @@ PROG= lpd MAN= lpd.8 SRCS= lpd.c printjob.c recvjob.c lpdchar.c modes.c -CFLAGS+= -I${.CURDIR}/../common_source +CFLAGS+= -I${.CURDIR:H}/common_source WARNS?= 1 Modified: head/usr.sbin/lpr/lpq/Makefile ============================================================================== --- head/usr.sbin/lpr/lpq/Makefile Wed Mar 1 05:06:21 2017 (r314474) +++ head/usr.sbin/lpr/lpq/Makefile Wed Mar 1 05:14:45 2017 (r314475) @@ -8,7 +8,7 @@ BINOWN= root BINGRP= daemon BINMODE= 6555 -CFLAGS+= -I${.CURDIR}/../common_source +CFLAGS+= -I${.CURDIR:H}/common_source LIBADD= lpr Modified: head/usr.sbin/lpr/lpr/Makefile ============================================================================== --- head/usr.sbin/lpr/lpr/Makefile Wed Mar 1 05:06:21 2017 (r314474) +++ head/usr.sbin/lpr/lpr/Makefile Wed Mar 1 05:14:45 2017 (r314475) @@ -1,7 +1,7 @@ # From: @(#)Makefile 8.1 (Berkeley) 6/6/93 # $FreeBSD$ -.PATH: ${.CURDIR}/../common_source +.PATH: ${.CURDIR:H}/common_source BINDIR= /usr/bin @@ -11,7 +11,7 @@ BINOWN= root BINGRP= daemon BINMODE= 6555 -CFLAGS+= -I${.CURDIR}/../common_source +CFLAGS+= -I${.CURDIR:H}/common_source WARNS?= 2 Modified: head/usr.sbin/lpr/lprm/Makefile ============================================================================== --- head/usr.sbin/lpr/lprm/Makefile Wed Mar 1 05:06:21 2017 (r314474) +++ head/usr.sbin/lpr/lprm/Makefile Wed Mar 1 05:14:45 2017 (r314475) @@ -1,7 +1,7 @@ # From: @(#)Makefile 8.1 (Berkeley) 6/6/93 # $FreeBSD$ -.PATH: ${.CURDIR}/../common_source +.PATH: ${.CURDIR:H}/common_source BINDIR= /usr/bin @@ -10,7 +10,7 @@ BINOWN= root BINGRP= daemon BINMODE= 6555 -CFLAGS+= -I${.CURDIR}/../common_source +CFLAGS+= -I${.CURDIR:H}/common_source LIBADD= lpr Modified: head/usr.sbin/lpr/lptest/Makefile ============================================================================== --- head/usr.sbin/lpr/lptest/Makefile Wed Mar 1 05:06:21 2017 (r314474) +++ head/usr.sbin/lpr/lptest/Makefile Wed Mar 1 05:14:45 2017 (r314475) @@ -3,6 +3,6 @@ PROG= lptest -CFLAGS+= -I${.CURDIR}/../common_source +CFLAGS+= -I${.CURDIR:H}/common_source .include Modified: head/usr.sbin/lpr/pac/Makefile ============================================================================== --- head/usr.sbin/lpr/pac/Makefile Wed Mar 1 05:06:21 2017 (r314474) +++ head/usr.sbin/lpr/pac/Makefile Wed Mar 1 05:14:45 2017 (r314475) @@ -1,12 +1,12 @@ # From: @(#)Makefile 8.1 (Berkeley) 6/6/93 # $FreeBSD$ -.PATH: ${.CURDIR}/../common_source +.PATH: ${.CURDIR:H}/common_source PROG= pac MAN= pac.8 -CFLAGS+= -I${.CURDIR}/../common_source +CFLAGS+= -I${.CURDIR:H}/common_source LIBADD= lpr