svn commit: r314475 - in head/usr.sbin/lpr: chkprintcap filters filters.ru/koi2855 filters.ru/koi2alt lpc lpd lpq lpr lprm lptest pac

Ngie Cooper ngie at FreeBSD.org
Wed Mar 1 05:14:48 UTC 2017 

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 <bsd.prog.mk>

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 <bsd.prog.mk>

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 <bsd.prog.mk>

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 <bsd.prog.mk>

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

More information about the svn-src-head mailing list