From aacb5cb6e4683342ef18bfa2083a118d42ed1af4 Mon Sep 17 00:00:00 2001 From: John Marino Date: Sun, 1 Nov 2015 22:29:52 +0100 Subject: [PATCH] locale type makefiles: respect ${SHAREDIR} The cldr2def tool was modified to generate makefiles that respect the SHAREDIR definition rather than hardcoding it. Taken-from: FreeBSD (collation branch) --- share/colldef/Makefile | 2 +- share/ctypedef/Makefile | 2 +- share/monetdef/Makefile | 2 +- share/msgdef/Makefile | 2 +- share/numericdef/Makefile | 2 +- share/timedef/Makefile | 2 +- tools/tools/locale/tools/cldr2def.pl | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/share/colldef/Makefile b/share/colldef/Makefile index 49d00ce6ac..72616aa735 100644 --- a/share/colldef/Makefile +++ b/share/colldef/Makefile @@ -1,7 +1,7 @@ # Warning: Do not edit. This file is automatically generated from the # tools in /usr/src/tools/tools/locale. -LOCALEDIR= /usr/share/locale +LOCALEDIR= ${SHAREDIR}/locale FILESNAME= LC_COLLATE .SUFFIXES: .src .LC_COLLATE MAPLOC= ${.CURDIR}/../../tools/tools/locale/etc/final-maps diff --git a/share/ctypedef/Makefile b/share/ctypedef/Makefile index fac59ea521..c0f7fce01e 100644 --- a/share/ctypedef/Makefile +++ b/share/ctypedef/Makefile @@ -1,7 +1,7 @@ # Warning: Do not edit. This file is automatically generated from the # tools in /usr/src/tools/tools/locale. -LOCALEDIR= /usr/share/locale +LOCALEDIR= ${SHAREDIR}/locale FILESNAME= LC_CTYPE .SUFFIXES: .src .LC_CTYPE MAPLOC= ${.CURDIR}/../../tools/tools/locale/etc/final-maps diff --git a/share/monetdef/Makefile b/share/monetdef/Makefile index 8b307c4d60..7ecfd9090e 100644 --- a/share/monetdef/Makefile +++ b/share/monetdef/Makefile @@ -1,7 +1,7 @@ # Warning: Do not edit. This file is automatically generated from the # tools in /usr/src/tools/tools/locale. -LOCALEDIR= /usr/share/locale +LOCALEDIR= ${SHAREDIR}/locale FILESNAME= LC_MONETARY .SUFFIXES: .src .out diff --git a/share/msgdef/Makefile b/share/msgdef/Makefile index 8b29dc2a33..0aec316252 100644 --- a/share/msgdef/Makefile +++ b/share/msgdef/Makefile @@ -1,7 +1,7 @@ # Warning: Do not edit. This file is automatically generated from the # tools in /usr/src/tools/tools/locale. -LOCALEDIR= /usr/share/locale +LOCALEDIR= ${SHAREDIR}/locale FILESNAME= LC_MESSAGES .SUFFIXES: .src .out diff --git a/share/numericdef/Makefile b/share/numericdef/Makefile index b23da709bd..501fd766ed 100644 --- a/share/numericdef/Makefile +++ b/share/numericdef/Makefile @@ -1,7 +1,7 @@ # Warning: Do not edit. This file is automatically generated from the # tools in /usr/src/tools/tools/locale. -LOCALEDIR= /usr/share/locale +LOCALEDIR= ${SHAREDIR}/locale FILESNAME= LC_NUMERIC .SUFFIXES: .src .out diff --git a/share/timedef/Makefile b/share/timedef/Makefile index b18cc0bfd5..3472cbb4f2 100644 --- a/share/timedef/Makefile +++ b/share/timedef/Makefile @@ -1,7 +1,7 @@ # Warning: Do not edit. This file is automatically generated from the # tools in /usr/src/tools/tools/locale. -LOCALEDIR= /usr/share/locale +LOCALEDIR= ${SHAREDIR}/locale FILESNAME= LC_TIME .SUFFIXES: .src .out diff --git a/tools/tools/locale/tools/cldr2def.pl b/tools/tools/locale/tools/cldr2def.pl index fec503ca3f..c2d59ce349 100644 --- a/tools/tools/locale/tools/cldr2def.pl +++ b/tools/tools/locale/tools/cldr2def.pl @@ -808,7 +808,7 @@ sub make_makefile { # Warning: Do not edit. This file is automatically generated from the # tools in /usr/src/tools/tools/locale. -LOCALEDIR= /usr/share/locale +LOCALEDIR= \${SHAREDIR}/locale FILESNAME= $FILESNAMES{$TYPE} .SUFFIXES: .src .${SRCOUT2} ${MAPLOC} -- 2.41.0