From 9fd71648953dbca9c0aba05931b147a45d1df3f6 Mon Sep 17 00:00:00 2001 From: ngie Date: Thu, 20 Jul 2017 01:07:02 +0000 Subject: [PATCH] MFC r314475: Simplify idioms in usr.sbin/lpr Makefiles Use :H instead of .CURDIR-relative pathing to simplify make output, etc. git-svn-id: svn://svn.freebsd.org/base/stable/10@321275 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f --- usr.sbin/lpr/chkprintcap/Makefile | 4 ++-- usr.sbin/lpr/filters.ru/koi2855/Makefile | 2 +- usr.sbin/lpr/filters.ru/koi2alt/Makefile | 2 +- usr.sbin/lpr/filters/Makefile | 2 +- usr.sbin/lpr/lpc/Makefile | 4 ++-- usr.sbin/lpr/lpd/Makefile | 2 +- usr.sbin/lpr/lpq/Makefile | 2 +- usr.sbin/lpr/lpr/Makefile | 4 ++-- usr.sbin/lpr/lprm/Makefile | 4 ++-- usr.sbin/lpr/lptest/Makefile | 2 +- usr.sbin/lpr/pac/Makefile | 4 ++-- 11 files changed, 16 insertions(+), 16 deletions(-) diff --git a/usr.sbin/lpr/chkprintcap/Makefile b/usr.sbin/lpr/chkprintcap/Makefile index ffffffbb2..41a1084da 100644 --- a/usr.sbin/lpr/chkprintcap/Makefile +++ b/usr.sbin/lpr/chkprintcap/Makefile @@ -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} diff --git a/usr.sbin/lpr/filters.ru/koi2855/Makefile b/usr.sbin/lpr/filters.ru/koi2855/Makefile index 71ffc09eb..564867d2b 100644 --- a/usr.sbin/lpr/filters.ru/koi2855/Makefile +++ b/usr.sbin/lpr/filters.ru/koi2855/Makefile @@ -3,6 +3,6 @@ PROG= koi2855 MAN= -CFLAGS+= -I${.CURDIR}/../../common_source +CFLAGS+= -I${.CURDIR:H:H}/common_source .include diff --git a/usr.sbin/lpr/filters.ru/koi2alt/Makefile b/usr.sbin/lpr/filters.ru/koi2alt/Makefile index 98f7ffe13..4e2f7853d 100644 --- a/usr.sbin/lpr/filters.ru/koi2alt/Makefile +++ b/usr.sbin/lpr/filters.ru/koi2alt/Makefile @@ -3,6 +3,6 @@ PROG= koi2alt MAN= -CFLAGS+= -I${.CURDIR}/../../common_source +CFLAGS+= -I${.CURDIR:H:H}/common_source .include diff --git a/usr.sbin/lpr/filters/Makefile b/usr.sbin/lpr/filters/Makefile index 7976752d0..a984e7898 100644 --- a/usr.sbin/lpr/filters/Makefile +++ b/usr.sbin/lpr/filters/Makefile @@ -6,6 +6,6 @@ BINDIR= ${LIBEXECDIR}/lpr PROG= lpf MAN= -CFLAGS+= -I${.CURDIR}/../common_source +CFLAGS+= -I${.CURDIR:H}/common_source .include diff --git a/usr.sbin/lpr/lpc/Makefile b/usr.sbin/lpr/lpc/Makefile index 35fa52ab1..f42bc3a0c 100644 --- a/usr.sbin/lpr/lpc/Makefile +++ b/usr.sbin/lpr/lpc/Makefile @@ -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 diff --git a/usr.sbin/lpr/lpd/Makefile b/usr.sbin/lpr/lpd/Makefile index 0d7d93ef7..9b9a80716 100644 --- a/usr.sbin/lpr/lpd/Makefile +++ b/usr.sbin/lpr/lpd/Makefile @@ -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 diff --git a/usr.sbin/lpr/lpq/Makefile b/usr.sbin/lpr/lpq/Makefile index 4df437e06..8ff1a879a 100644 --- a/usr.sbin/lpr/lpq/Makefile +++ b/usr.sbin/lpr/lpq/Makefile @@ -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} diff --git a/usr.sbin/lpr/lpr/Makefile b/usr.sbin/lpr/lpr/Makefile index 1894b0089..15c6c1ea6 100644 --- a/usr.sbin/lpr/lpr/Makefile +++ b/usr.sbin/lpr/lpr/Makefile @@ -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 diff --git a/usr.sbin/lpr/lprm/Makefile b/usr.sbin/lpr/lprm/Makefile index 44bc93ac2..467207e49 100644 --- a/usr.sbin/lpr/lprm/Makefile +++ b/usr.sbin/lpr/lprm/Makefile @@ -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} diff --git a/usr.sbin/lpr/lptest/Makefile b/usr.sbin/lpr/lptest/Makefile index 65b1c7c8f..18083e529 100644 --- a/usr.sbin/lpr/lptest/Makefile +++ b/usr.sbin/lpr/lptest/Makefile @@ -3,6 +3,6 @@ PROG= lptest -CFLAGS+= -I${.CURDIR}/../common_source +CFLAGS+= -I${.CURDIR:H}/common_source .include diff --git a/usr.sbin/lpr/pac/Makefile b/usr.sbin/lpr/pac/Makefile index bd895a71a..2e7afe409 100644 --- a/usr.sbin/lpr/pac/Makefile +++ b/usr.sbin/lpr/pac/Makefile @@ -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} -- 2.45.0