From owner-svn-src-all@freebsd.org Thu Jul 20 01:07:04 2017 Return-Path: Delivered-To: svn-src-all@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 4DD8ED9D3C4; Thu, 20 Jul 2017 01:07:04 +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 283A774891; Thu, 20 Jul 2017 01:07:04 +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 v6K173XI038912; Thu, 20 Jul 2017 01:07:03 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v6K172Qd038901; Thu, 20 Jul 2017 01:07:02 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201707200107.v6K172Qd038901@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Ngie Cooper Date: Thu, 20 Jul 2017 01:07:02 +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: r321275 - in stable/10/usr.sbin/lpr: chkprintcap filters filters.ru/koi2855 filters.ru/koi2alt lpc lpd lpq lpr lprm lptest pac X-SVN-Group: stable-10 X-SVN-Commit-Author: ngie X-SVN-Commit-Paths: in stable/10/usr.sbin/lpr: chkprintcap filters filters.ru/koi2855 filters.ru/koi2alt lpc lpd lpq lpr lprm lptest pac X-SVN-Commit-Revision: 321275 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 20 Jul 2017 01:07:04 -0000 Author: ngie Date: Thu Jul 20 01:07:02 2017 New Revision: 321275 URL: https://svnweb.freebsd.org/changeset/base/321275 Log: MFC r314475: Simplify idioms in usr.sbin/lpr Makefiles Use :H instead of .CURDIR-relative pathing to simplify make output, etc. Modified: stable/10/usr.sbin/lpr/chkprintcap/Makefile stable/10/usr.sbin/lpr/filters.ru/koi2855/Makefile stable/10/usr.sbin/lpr/filters.ru/koi2alt/Makefile stable/10/usr.sbin/lpr/filters/Makefile stable/10/usr.sbin/lpr/lpc/Makefile stable/10/usr.sbin/lpr/lpd/Makefile stable/10/usr.sbin/lpr/lpq/Makefile stable/10/usr.sbin/lpr/lpr/Makefile stable/10/usr.sbin/lpr/lprm/Makefile stable/10/usr.sbin/lpr/lptest/Makefile stable/10/usr.sbin/lpr/pac/Makefile Directory Properties: stable/10/ (props changed) Modified: stable/10/usr.sbin/lpr/chkprintcap/Makefile ============================================================================== --- stable/10/usr.sbin/lpr/chkprintcap/Makefile Thu Jul 20 01:03:50 2017 (r321274) +++ stable/10/usr.sbin/lpr/chkprintcap/Makefile Thu Jul 20 01:07:02 2017 (r321275) @@ -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 DPADD= ${LIBLPR} LDADD= ${LIBLPR} Modified: stable/10/usr.sbin/lpr/filters.ru/koi2855/Makefile ============================================================================== --- stable/10/usr.sbin/lpr/filters.ru/koi2855/Makefile Thu Jul 20 01:03:50 2017 (r321274) +++ stable/10/usr.sbin/lpr/filters.ru/koi2855/Makefile Thu Jul 20 01:07:02 2017 (r321275) @@ -3,6 +3,6 @@ PROG= koi2855 MAN= -CFLAGS+= -I${.CURDIR}/../../common_source +CFLAGS+= -I${.CURDIR:H:H}/common_source .include Modified: stable/10/usr.sbin/lpr/filters.ru/koi2alt/Makefile ============================================================================== --- stable/10/usr.sbin/lpr/filters.ru/koi2alt/Makefile Thu Jul 20 01:03:50 2017 (r321274) +++ stable/10/usr.sbin/lpr/filters.ru/koi2alt/Makefile Thu Jul 20 01:07:02 2017 (r321275) @@ -3,6 +3,6 @@ PROG= koi2alt MAN= -CFLAGS+= -I${.CURDIR}/../../common_source +CFLAGS+= -I${.CURDIR:H:H}/common_source .include Modified: stable/10/usr.sbin/lpr/filters/Makefile ============================================================================== --- stable/10/usr.sbin/lpr/filters/Makefile Thu Jul 20 01:03:50 2017 (r321274) +++ stable/10/usr.sbin/lpr/filters/Makefile Thu Jul 20 01:07:02 2017 (r321275) @@ -6,6 +6,6 @@ BINDIR= ${LIBEXECDIR}/lpr PROG= lpf MAN= -CFLAGS+= -I${.CURDIR}/../common_source +CFLAGS+= -I${.CURDIR:H}/common_source .include Modified: stable/10/usr.sbin/lpr/lpc/Makefile ============================================================================== --- stable/10/usr.sbin/lpr/lpc/Makefile Thu Jul 20 01:03:50 2017 (r321274) +++ stable/10/usr.sbin/lpr/lpc/Makefile Thu Jul 20 01:07:02 2017 (r321275) @@ -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: stable/10/usr.sbin/lpr/lpd/Makefile ============================================================================== --- stable/10/usr.sbin/lpr/lpd/Makefile Thu Jul 20 01:03:50 2017 (r321274) +++ stable/10/usr.sbin/lpr/lpd/Makefile Thu Jul 20 01:07:02 2017 (r321275) @@ -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: stable/10/usr.sbin/lpr/lpq/Makefile ============================================================================== --- stable/10/usr.sbin/lpr/lpq/Makefile Thu Jul 20 01:03:50 2017 (r321274) +++ stable/10/usr.sbin/lpr/lpq/Makefile Thu Jul 20 01:07:02 2017 (r321275) @@ -8,7 +8,7 @@ BINOWN= root BINGRP= daemon BINMODE= 6555 -CFLAGS+= -I${.CURDIR}/../common_source +CFLAGS+= -I${.CURDIR:H}/common_source DPADD= ${LIBLPR} LDADD= ${LIBLPR} Modified: stable/10/usr.sbin/lpr/lpr/Makefile ============================================================================== --- stable/10/usr.sbin/lpr/lpr/Makefile Thu Jul 20 01:03:50 2017 (r321274) +++ stable/10/usr.sbin/lpr/lpr/Makefile Thu Jul 20 01:07:02 2017 (r321275) @@ -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: stable/10/usr.sbin/lpr/lprm/Makefile ============================================================================== --- stable/10/usr.sbin/lpr/lprm/Makefile Thu Jul 20 01:03:50 2017 (r321274) +++ stable/10/usr.sbin/lpr/lprm/Makefile Thu Jul 20 01:07:02 2017 (r321275) @@ -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 DPADD= ${LIBLPR} LDADD= ${LIBLPR} Modified: stable/10/usr.sbin/lpr/lptest/Makefile ============================================================================== --- stable/10/usr.sbin/lpr/lptest/Makefile Thu Jul 20 01:03:50 2017 (r321274) +++ stable/10/usr.sbin/lpr/lptest/Makefile Thu Jul 20 01:07:02 2017 (r321275) @@ -3,6 +3,6 @@ PROG= lptest -CFLAGS+= -I${.CURDIR}/../common_source +CFLAGS+= -I${.CURDIR:H}/common_source .include Modified: stable/10/usr.sbin/lpr/pac/Makefile ============================================================================== --- stable/10/usr.sbin/lpr/pac/Makefile Thu Jul 20 01:03:50 2017 (r321274) +++ stable/10/usr.sbin/lpr/pac/Makefile Thu Jul 20 01:07:02 2017 (r321275) @@ -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 DPADD= ${LIBLPR} LDADD= ${LIBLPR}