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

4 files changed, 6 insertions, 6 deletions

diff --git a/share/i18n/csmapper/Makefile.inc b/share/i18n/csmapper/Makefile.inc
index 8ebd03447c89..284900c1bc05 100644
--- a/share/i18n/csmapper/Makefile.inc
+++ b/share/i18n/csmapper/Makefile.inc
@@ -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
diff --git a/share/i18n/csmapper/Makefile.part b/share/i18n/csmapper/Makefile.part
index 2f48b709bf9e..4dbb4ff313dd 100644
--- a/share/i18n/csmapper/Makefile.part
+++ b/share/i18n/csmapper/Makefile.part
@@ -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
diff --git a/share/i18n/esdb/Makefile.inc b/share/i18n/esdb/Makefile.inc
index 09886c7d70f4..ab61d2cee22f 100644
--- a/share/i18n/esdb/Makefile.inc
+++ b/share/i18n/esdb/Makefile.inc
@@ -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
diff --git a/share/i18n/esdb/Makefile.part b/share/i18n/esdb/Makefile.part
index 68bd40d5dc44..703854e6e527 100644
--- a/share/i18n/esdb/Makefile.part
+++ b/share/i18n/esdb/Makefile.part
@@ -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/:/@/}