Date: Thu, 20 Jul 2017 01:07:15 +0000 (UTC) From: Ngie Cooper <ngie@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r321276 - in stable/11/usr.sbin/lpr: chkprintcap filters filters.ru/koi2855 filters.ru/koi2alt lpc lpd lpq lpr lprm lptest pac Message-ID: <201707200107.v6K17FNM038964@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ngie Date: Thu Jul 20 01:07:15 2017 New Revision: 321276 URL: https://svnweb.freebsd.org/changeset/base/321276 Log: MFC r314475: Simplify idioms in usr.sbin/lpr Makefiles Use :H instead of .CURDIR-relative pathing to simplify make output, etc. Modified: stable/11/usr.sbin/lpr/chkprintcap/Makefile stable/11/usr.sbin/lpr/filters.ru/koi2855/Makefile stable/11/usr.sbin/lpr/filters.ru/koi2alt/Makefile stable/11/usr.sbin/lpr/filters/Makefile stable/11/usr.sbin/lpr/lpc/Makefile stable/11/usr.sbin/lpr/lpd/Makefile stable/11/usr.sbin/lpr/lpq/Makefile stable/11/usr.sbin/lpr/lpr/Makefile stable/11/usr.sbin/lpr/lprm/Makefile stable/11/usr.sbin/lpr/lptest/Makefile stable/11/usr.sbin/lpr/pac/Makefile Directory Properties: stable/11/ (props changed) Modified: stable/11/usr.sbin/lpr/chkprintcap/Makefile ============================================================================== --- stable/11/usr.sbin/lpr/chkprintcap/Makefile Thu Jul 20 01:07:02 2017 (r321275) +++ stable/11/usr.sbin/lpr/chkprintcap/Makefile Thu Jul 20 01:07:15 2017 (r321276) @@ -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: stable/11/usr.sbin/lpr/filters.ru/koi2855/Makefile ============================================================================== --- stable/11/usr.sbin/lpr/filters.ru/koi2855/Makefile Thu Jul 20 01:07:02 2017 (r321275) +++ stable/11/usr.sbin/lpr/filters.ru/koi2855/Makefile Thu Jul 20 01:07:15 2017 (r321276) @@ -3,6 +3,6 @@ PROG= koi2855 MAN= -CFLAGS+= -I${.CURDIR}/../../common_source +CFLAGS+= -I${.CURDIR:H:H}/common_source .include <bsd.prog.mk> Modified: stable/11/usr.sbin/lpr/filters.ru/koi2alt/Makefile ============================================================================== --- stable/11/usr.sbin/lpr/filters.ru/koi2alt/Makefile Thu Jul 20 01:07:02 2017 (r321275) +++ stable/11/usr.sbin/lpr/filters.ru/koi2alt/Makefile Thu Jul 20 01:07:15 2017 (r321276) @@ -3,6 +3,6 @@ PROG= koi2alt MAN= -CFLAGS+= -I${.CURDIR}/../../common_source +CFLAGS+= -I${.CURDIR:H:H}/common_source .include <bsd.prog.mk> Modified: stable/11/usr.sbin/lpr/filters/Makefile ============================================================================== --- stable/11/usr.sbin/lpr/filters/Makefile Thu Jul 20 01:07:02 2017 (r321275) +++ stable/11/usr.sbin/lpr/filters/Makefile Thu Jul 20 01:07:15 2017 (r321276) @@ -6,6 +6,6 @@ BINDIR= ${LIBEXECDIR}/lpr PROG= lpf MAN= -CFLAGS+= -I${.CURDIR}/../common_source +CFLAGS+= -I${.CURDIR:H}/common_source .include <bsd.prog.mk> Modified: stable/11/usr.sbin/lpr/lpc/Makefile ============================================================================== --- stable/11/usr.sbin/lpr/lpc/Makefile Thu Jul 20 01:07:02 2017 (r321275) +++ stable/11/usr.sbin/lpr/lpc/Makefile Thu Jul 20 01:07:15 2017 (r321276) @@ -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/11/usr.sbin/lpr/lpd/Makefile ============================================================================== --- stable/11/usr.sbin/lpr/lpd/Makefile Thu Jul 20 01:07:02 2017 (r321275) +++ stable/11/usr.sbin/lpr/lpd/Makefile Thu Jul 20 01:07:15 2017 (r321276) @@ -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/11/usr.sbin/lpr/lpq/Makefile ============================================================================== --- stable/11/usr.sbin/lpr/lpq/Makefile Thu Jul 20 01:07:02 2017 (r321275) +++ stable/11/usr.sbin/lpr/lpq/Makefile Thu Jul 20 01:07:15 2017 (r321276) @@ -8,7 +8,7 @@ BINOWN= root BINGRP= daemon BINMODE= 6555 -CFLAGS+= -I${.CURDIR}/../common_source +CFLAGS+= -I${.CURDIR:H}/common_source LIBADD= lpr Modified: stable/11/usr.sbin/lpr/lpr/Makefile ============================================================================== --- stable/11/usr.sbin/lpr/lpr/Makefile Thu Jul 20 01:07:02 2017 (r321275) +++ stable/11/usr.sbin/lpr/lpr/Makefile Thu Jul 20 01:07:15 2017 (r321276) @@ -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/11/usr.sbin/lpr/lprm/Makefile ============================================================================== --- stable/11/usr.sbin/lpr/lprm/Makefile Thu Jul 20 01:07:02 2017 (r321275) +++ stable/11/usr.sbin/lpr/lprm/Makefile Thu Jul 20 01:07:15 2017 (r321276) @@ -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: stable/11/usr.sbin/lpr/lptest/Makefile ============================================================================== --- stable/11/usr.sbin/lpr/lptest/Makefile Thu Jul 20 01:07:02 2017 (r321275) +++ stable/11/usr.sbin/lpr/lptest/Makefile Thu Jul 20 01:07:15 2017 (r321276) @@ -3,6 +3,6 @@ PROG= lptest -CFLAGS+= -I${.CURDIR}/../common_source +CFLAGS+= -I${.CURDIR:H}/common_source .include <bsd.prog.mk> Modified: stable/11/usr.sbin/lpr/pac/Makefile ============================================================================== --- stable/11/usr.sbin/lpr/pac/Makefile Thu Jul 20 01:07:02 2017 (r321275) +++ stable/11/usr.sbin/lpr/pac/Makefile Thu Jul 20 01:07:15 2017 (r321276) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201707200107.v6K17FNM038964>