Author: ngie
Date: Sat Mar 4 11:26:40 2017
New Revision: 314652
URL: https://svnweb.freebsd.org/changeset/base/314652
Log:
share: normalize paths using SRCTOP-relative paths or :H when possible
This simplifies make logic/output
MFC after: 1 month
Sponsored by: Dell EMC Isilon
Modified:
head/share/colldef/Makefile
head/share/ctypedef/Makefile
head/share/doc/atf/Makefile
head/share/doc/legal/intel_ipw/Makefile
head/share/doc/legal/intel_iwi/Makefile
head/share/doc/legal/intel_iwn/Makefile
head/share/doc/legal/intel_wpi/Makefile
head/share/doc/legal/realtek/Makefile
head/share/doc/llvm/Makefile
head/share/doc/llvm/clang/Makefile
head/share/doc/smm/08.sendmailop/Makefile
head/share/doc/usd/19.memacros/Makefile
head/share/doc/usd/20.meref/Makefile
head/share/examples/Makefile
head/share/examples/ipfilter/Makefile
head/share/examples/smbfs/Makefile
head/share/examples/smbfs/print/Makefile
head/share/i18n/csmapper/Makefile.inc
head/share/i18n/csmapper/Makefile.part
head/share/i18n/esdb/Makefile.inc
head/share/i18n/esdb/Makefile.part
head/share/man/man1/Makefile
head/share/man/man4/Makefile
head/share/man/man7/Makefile
head/share/sendmail/Makefile
head/share/zoneinfo/Makefile
Modified: head/share/colldef/Makefile
==============================================================================
--- head/share/colldef/Makefile Sat Mar 4 10:10:17 2017 (r314651)
+++ head/share/colldef/Makefile Sat Mar 4 11:26:40 2017 (r314652)
@@ -5,7 +5,7 @@
LOCALEDIR= ${SHAREDIR}/locale
FILESNAME= LC_COLLATE
.SUFFIXES: .src .LC_COLLATE
-MAPLOC= ${.CURDIR}/../../tools/tools/locale/etc/final-maps
+MAPLOC= ${SRCTOP}/tools/tools/locale/etc/final-maps
.src.LC_COLLATE:
localedef -D -U -i ${.IMPSRC} \
Modified: head/share/ctypedef/Makefile
==============================================================================
--- head/share/ctypedef/Makefile Sat Mar 4 10:10:17 2017
(r314651)
+++ head/share/ctypedef/Makefile Sat Mar 4 11:26:40 2017
(r314652)
@@ -5,7 +5,7 @@
LOCALEDIR= ${SHAREDIR}/locale
FILESNAME= LC_CTYPE
.SUFFIXES: .src .LC_CTYPE
-MAPLOC= ${.CURDIR}/../../tools/tools/locale/etc/final-maps
+MAPLOC= ${SRCTOP}/tools/tools/locale/etc/final-maps
.src.LC_CTYPE:
localedef -D -U -c -w ${MAPLOC}/widths.txt \
Modified: head/share/doc/atf/Makefile
==============================================================================
--- head/share/doc/atf/Makefile Sat Mar 4 10:10:17 2017 (r314651)
+++ head/share/doc/atf/Makefile Sat Mar 4 11:26:40 2017 (r314652)
@@ -25,9 +25,8 @@
#
# $FreeBSD$
-ATF= ${.CURDIR}/../../../contrib/atf
-.PATH: ${ATF}
-.PATH: ${ATF}/doc
+ATF= ${SRCTOP}/contrib/atf
+.PATH: ${ATF} ${ATF}/doc
FILESGROUPS= TOP
Modified: head/share/doc/legal/intel_ipw/Makefile
==============================================================================
--- head/share/doc/legal/intel_ipw/Makefile Sat Mar 4 10:10:17 2017
(r314651)
+++ head/share/doc/legal/intel_ipw/Makefile Sat Mar 4 11:26:40 2017
(r314652)
@@ -1,6 +1,6 @@
# $FreeBSD$
-FILES= ${.CURDIR}/../../../../sys/contrib/dev/ipw/LICENSE
+FILES= ${SRCTOP}/sys/contrib/dev/ipw/LICENSE
FILESDIR= ${SHAREDIR}/doc/legal
FILESNAME= intel_ipw.LICENSE
Modified: head/share/doc/legal/intel_iwi/Makefile
==============================================================================
--- head/share/doc/legal/intel_iwi/Makefile Sat Mar 4 10:10:17 2017
(r314651)
+++ head/share/doc/legal/intel_iwi/Makefile Sat Mar 4 11:26:40 2017
(r314652)
@@ -1,6 +1,6 @@
# $FreeBSD$
-FILES= ${.CURDIR}/../../../../sys/contrib/dev/iwi/LICENSE
+FILES= ${SRCTOP}/sys/contrib/dev/iwi/LICENSE
FILESDIR= ${SHAREDIR}/doc/legal
FILESNAME= intel_iwi.LICENSE
Modified: head/share/doc/legal/intel_iwn/Makefile
==============================================================================
--- head/share/doc/legal/intel_iwn/Makefile Sat Mar 4 10:10:17 2017
(r314651)
+++ head/share/doc/legal/intel_iwn/Makefile Sat Mar 4 11:26:40 2017
(r314652)
@@ -1,6 +1,6 @@
# $FreeBSD$
-FILES= ${.CURDIR}/../../../../sys/contrib/dev/iwn/LICENSE
+FILES= ${SRCTOP}/sys/contrib/dev/iwn/LICENSE
FILESDIR= ${SHAREDIR}/doc/legal
FILESNAME= intel_iwn.LICENSE
Modified: head/share/doc/legal/intel_wpi/Makefile
==============================================================================
--- head/share/doc/legal/intel_wpi/Makefile Sat Mar 4 10:10:17 2017
(r314651)
+++ head/share/doc/legal/intel_wpi/Makefile Sat Mar 4 11:26:40 2017
(r314652)
@@ -1,6 +1,6 @@
# $FreeBSD$
-FILES= ${.CURDIR}/../../../../sys/contrib/dev/wpi/LICENSE
+FILES= ${SRCTOP}/sys/contrib/dev/wpi/LICENSE
FILESDIR= ${SHAREDIR}/doc/legal
FILESNAME= intel_wpi.LICENSE
Modified: head/share/doc/legal/realtek/Makefile
==============================================================================
--- head/share/doc/legal/realtek/Makefile Sat Mar 4 10:10:17 2017
(r314651)
+++ head/share/doc/legal/realtek/Makefile Sat Mar 4 11:26:40 2017
(r314652)
@@ -1,6 +1,6 @@
# $FreeBSD$
-FILES= ${.CURDIR}/../../../../sys/contrib/dev/rtwn/LICENSE
+FILES= ${SRCTOP}/sys/contrib/dev/rtwn/LICENSE
FILESDIR= ${SHAREDIR}/doc/legal
FILESNAME= realtek.LICENSE
Modified: head/share/doc/llvm/Makefile
==============================================================================
--- head/share/doc/llvm/Makefile Sat Mar 4 10:10:17 2017
(r314651)
+++ head/share/doc/llvm/Makefile Sat Mar 4 11:26:40 2017
(r314652)
@@ -2,7 +2,7 @@
SUBDIR= clang
-SRCDIR= ${.CURDIR}/../../../contrib/llvm
+SRCDIR= ${SRCTOP}/contrib/llvm
.PATH: ${SRCDIR} ${SRCDIR}/lib/Support
Modified: head/share/doc/llvm/clang/Makefile
==============================================================================
--- head/share/doc/llvm/clang/Makefile Sat Mar 4 10:10:17 2017
(r314651)
+++ head/share/doc/llvm/clang/Makefile Sat Mar 4 11:26:40 2017
(r314652)
@@ -1,6 +1,6 @@
# $FreeBSD$
-SRCDIR= ${.CURDIR}/../../../../contrib/llvm/tools/clang
+SRCDIR= ${SRCTOP}/contrib/llvm/tools/clang
.PATH: ${SRCDIR}
Modified: head/share/doc/smm/08.sendmailop/Makefile
==============================================================================
--- head/share/doc/smm/08.sendmailop/Makefile Sat Mar 4 10:10:17 2017
(r314651)
+++ head/share/doc/smm/08.sendmailop/Makefile Sat Mar 4 11:26:40 2017
(r314652)
@@ -6,6 +6,6 @@ SRCS= op.me
MACROS= -me
USE_PIC=
USE_EQN=
-SRCDIR= ${.CURDIR}/../../../../contrib/sendmail/doc/op
+SRCDIR= ${SRCTOP}/contrib/sendmail/doc/op
.include <bsd.doc.mk>
Modified: head/share/doc/usd/19.memacros/Makefile
==============================================================================
--- head/share/doc/usd/19.memacros/Makefile Sat Mar 4 10:10:17 2017
(r314651)
+++ head/share/doc/usd/19.memacros/Makefile Sat Mar 4 11:26:40 2017
(r314652)
@@ -4,7 +4,7 @@
VOLUME= usd/19.memacros
SRCS= meintro.me-sed
MACROS= -me
-GROFFDIR= ${.CURDIR}/../../../../contrib/groff
+GROFFDIR= ${SRCTOP}/contrib/groff
SRCDIR= ${GROFFDIR}/doc
version=`cat ${GROFFDIR}/VERSION`
Modified: head/share/doc/usd/20.meref/Makefile
==============================================================================
--- head/share/doc/usd/20.meref/Makefile Sat Mar 4 10:10:17 2017
(r314651)
+++ head/share/doc/usd/20.meref/Makefile Sat Mar 4 11:26:40 2017
(r314652)
@@ -4,7 +4,7 @@
VOLUME= usd/20.meref
SRCS= meref.me-sed
MACROS= -me
-GROFFDIR= ${.CURDIR}/../../../../contrib/groff
+GROFFDIR= ${SRCTOP}/contrib/groff
SRCDIR= ${GROFFDIR}/doc
version=`cat ${GROFFDIR}/VERSION`
Modified: head/share/examples/Makefile
==============================================================================
--- head/share/examples/Makefile Sat Mar 4 10:10:17 2017
(r314651)
+++ head/share/examples/Makefile Sat Mar 4 11:26:40 2017
(r314652)
@@ -241,7 +241,7 @@ copies:
fi
.endfor
mtree -deU ${MTREE_FOLLOWS_SYMLINKS} \
- -f ${.CURDIR}/../../etc/mtree/BSD.usr.dist -p ${DESTDIR}/usr
+ -f ${SRCTOP}/etc/mtree/BSD.usr.dist -p ${DESTDIR}/usr
.for file in ${XFILES}
${INSTALL} -T package=${PACKAGE_${file}:Uexamples} -o ${SHAREOWN} -g
${SHAREGRP} -m ${SHAREMODE} \
${.CURDIR}/${file} ${DESTDIR}${BINDIR}/${file}
@@ -255,7 +255,7 @@ symlinks:
etc-examples:
.if ${SHARED} != "symlinks"
- ${_+_}(cd ${.CURDIR}/../../etc; ${MAKE} etc-examples)
+ ${_+_}(cd ${SRCTOP}/etc; ${MAKE} etc-examples)
.endif
.if ${SHARED} != "symlinks"
Modified: head/share/examples/ipfilter/Makefile
==============================================================================
--- head/share/examples/ipfilter/Makefile Sat Mar 4 10:10:17 2017
(r314651)
+++ head/share/examples/ipfilter/Makefile Sat Mar 4 11:26:40 2017
(r314652)
@@ -4,9 +4,9 @@ PACKAGE=examples
FILES= README
# dist sample files
-.PATH: ${.CURDIR}/../../../contrib/ipfilter/rules \
- ${.CURDIR}/../../../contrib/ipfilter \
- ${.CURDIR}/../../../contrib/ipfilter/man
+.PATH: ${SRCTOP}/contrib/ipfilter/rules \
+ ${SRCTOP}/contrib/ipfilter \
+ ${SRCTOP}/contrib/ipfilter/man
FILES+= BASIC.NAT BASIC_1.FW BASIC_2.FW \
example.1 example.2 example.3 example.4 example.5 \
example.6 example.7 example.8 example.9 example.10 \
Modified: head/share/examples/smbfs/Makefile
==============================================================================
--- head/share/examples/smbfs/Makefile Sat Mar 4 10:10:17 2017
(r314651)
+++ head/share/examples/smbfs/Makefile Sat Mar 4 11:26:40 2017
(r314652)
@@ -4,7 +4,7 @@ PACKAGE=examples
FILESDIR= ${SHAREDIR}/examples/smbfs
FILES= dot.nsmbrc
-.PATH: ${.CURDIR}/../../../contrib/smbfs/examples
+.PATH: ${SRCTOP}/contrib/smbfs/examples
SUBDIR= print
Modified: head/share/examples/smbfs/print/Makefile
==============================================================================
--- head/share/examples/smbfs/print/Makefile Sat Mar 4 10:10:17 2017
(r314651)
+++ head/share/examples/smbfs/print/Makefile Sat Mar 4 11:26:40 2017
(r314652)
@@ -4,6 +4,6 @@ PACKAGE=examples
FILESDIR= ${SHAREDIR}/examples/smbfs/print
FILES= lj6l ljspool printcap.sample tolj
-.PATH: ${.CURDIR}/../../../../contrib/smbfs/examples/print
+.PATH: ${SRCTOP}/contrib/smbfs/examples/print
.include <bsd.prog.mk>
Modified: head/share/i18n/csmapper/Makefile.inc
==============================================================================
--- head/share/i18n/csmapper/Makefile.inc Sat Mar 4 10:10:17 2017
(r314651)
+++ head/share/i18n/csmapper/Makefile.inc Sat Mar 4 11:26:40 2017
(r314652)
@@ -6,4 +6,4 @@ CSMAPPERDIR?= /usr/share/i18n/csmapper
.if ${MK_STAGING} == "yes"
MKCSMAPPER= ${STAGE_HOST_OBJTOP}/usr/bin/mkcsmapper_static
.endif
-MKCSMAPPER?= ${.OBJDIR}/../../../usr.bin/mkcsmapper_static/mkcsmapper_static
+MKCSMAPPER?= ${.OBJDIR:H:H:H}/usr.bin/mkcsmapper_static/mkcsmapper_static
Modified: head/share/i18n/csmapper/Makefile.part
==============================================================================
--- head/share/i18n/csmapper/Makefile.part Sat Mar 4 10:10:17 2017
(r314651)
+++ head/share/i18n/csmapper/Makefile.part Sat Mar 4 11:26:40 2017
(r314652)
@@ -1,7 +1,7 @@
# $FreeBSD$
# $NetBSD: Makefile,v 1.13 2007/03/13 16:34:37 tnozaki Exp $
-MKCSMAPPER?= ${.OBJDIR}/../../../../usr.bin/mkcsmapper_static/mkcsmapper_static
+MKCSMAPPER?= ${.OBJDIR:H:H:H:H}/usr.bin/mkcsmapper_static/mkcsmapper_static
ESUBDIR?= ${CODE}
PARTFILE?= ${.CURDIR}/${CODE}.part
@@ -14,7 +14,7 @@ RTABLENAME?= UCS%${CODE}-%%PART%%
ENCID?= ${CODE}%%PART%%
ENCEXT?= .mps
MAPPER?= mapper_std
-REVSYMBOL?=
+REVSYMBOL?=
FILESDIR= ${CSMAPPERDIR}/${ESUBDIR}
.SUFFIXES: .src .646 .mps
Modified: head/share/i18n/esdb/Makefile.inc
==============================================================================
--- head/share/i18n/esdb/Makefile.inc Sat Mar 4 10:10:17 2017
(r314651)
+++ head/share/i18n/esdb/Makefile.inc Sat Mar 4 11:26:40 2017
(r314652)
@@ -8,4 +8,4 @@ ESDBDIR?= /usr/share/i18n/esdb
.if ${MK_STAGING} == "yes"
MKESDB= ${STAGE_HOST_OBJTOP}/usr/bin/mkesdb_static
.endif
-MKESDB?= ${.OBJDIR}/../../../usr.bin/mkesdb_static/mkesdb_static
+MKESDB?= ${.OBJDIR:H:H:H}/usr.bin/mkesdb_static/mkesdb_static
Modified: head/share/i18n/esdb/Makefile.part
==============================================================================
--- head/share/i18n/esdb/Makefile.part Sat Mar 4 10:10:17 2017
(r314651)
+++ head/share/i18n/esdb/Makefile.part Sat Mar 4 11:26:40 2017
(r314652)
@@ -1,7 +1,7 @@
# $FreeBSD$
# $NetBSD: Makefile.part,v 1.6 2008/10/25 22:35:36 apb Exp $
-MKESDB?= ${.OBJDIR}/../../../../usr.bin/mkesdb_static/mkesdb_static
+MKESDB?= ${.OBJDIR:H:H:H:H}/usr.bin/mkesdb_static/mkesdb_static
PARTFILE?= ${.CURDIR}/${CODE}.part
ALIASFILE?= ${.CURDIR}/${CODE}.alias
@@ -16,7 +16,7 @@ CODESETS?= ${PART:C/^/${CODE}${SEP}/}
EPREFIX?= ${CODE}${SEP}
.else
CODESETS?= ${PART}
-EPREFIX?=
+EPREFIX?=
.endif
ESUBDIR?= ${CODE}
ESDB?= ${CODESETS:C/$/.esdb/:S/:/@/}
Modified: head/share/man/man1/Makefile
==============================================================================
--- head/share/man/man1/Makefile Sat Mar 4 10:10:17 2017
(r314651)
+++ head/share/man/man1/Makefile Sat Mar 4 11:26:40 2017
(r314652)
@@ -8,7 +8,7 @@ MAN= builtin.1 intro.1
PACKAGE=runtime-manuals
.if ${MK_TESTS} != "no"
-ATF= ${.CURDIR}/../../../contrib/atf
+ATF= ${SRCTOP}/contrib/atf
.PATH: ${ATF}/doc
MAN+= atf-test-program.1
.endif
Modified: head/share/man/man4/Makefile
==============================================================================
--- head/share/man/man4/Makefile Sat Mar 4 10:10:17 2017
(r314651)
+++ head/share/man/man4/Makefile Sat Mar 4 11:26:40 2017
(r314652)
@@ -896,7 +896,7 @@ MAN+= mlx4ib.4
.endif
.if ${MK_TESTS} != "no"
-ATF= ${.CURDIR}/../../../contrib/atf
+ATF= ${SRCTOP}/contrib/atf
.PATH: ${ATF}/doc
_atf_test_case.4= atf-test-case.4
.endif
Modified: head/share/man/man7/Makefile
==============================================================================
--- head/share/man/man7/Makefile Sat Mar 4 10:10:17 2017
(r314651)
+++ head/share/man/man7/Makefile Sat Mar 4 11:26:40 2017
(r314652)
@@ -43,7 +43,7 @@ MLINKS+= c99.7 c89.7
MLINKS+= c99.7 c90.7
.if ${MK_TESTS} != "no"
-ATF= ${.CURDIR}/../../../contrib/atf
+ATF= ${SRCTOP}/contrib/atf
.PATH: ${ATF}/doc
MAN+= atf.7
Modified: head/share/sendmail/Makefile
==============================================================================
--- head/share/sendmail/Makefile Sat Mar 4 10:10:17 2017
(r314651)
+++ head/share/sendmail/Makefile Sat Mar 4 11:26:40 2017
(r314652)
@@ -4,7 +4,7 @@
PACKAGE= sendmail
FILESGROUPS+= SM
-SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail
+SENDMAIL_DIR= ${SRCTOP}/contrib/sendmail
CFDIR= cf
CFPACKAGE= sendmail
CFDIRS!= (cd ${SENDMAIL_DIR}; find -L ${CFDIR} \( \( -name CVS -o -name
.svn \) -prune \) -o -type d -print)
Modified: head/share/zoneinfo/Makefile
==============================================================================
--- head/share/zoneinfo/Makefile Sat Mar 4 10:10:17 2017
(r314651)
+++ head/share/zoneinfo/Makefile Sat Mar 4 11:26:40 2017
(r314652)
@@ -30,7 +30,7 @@
CLEANFILES+= yearistype
CLEANDIRS+= builddir
-CONTRIBDIR= ${.CURDIR}/../../contrib/tzdata/
+CONTRIBDIR= ${SRCTOP}/contrib/tzdata/
.PATH: ${CONTRIBDIR}
.if defined(LEAPSECONDS)
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
