diff mbox

BZ #14259: Support --localedir. (committed)

Message ID 56CE5453.3070500@redhat.com
State Committed
Headers show

Commit Message

Carlos O'Donell Feb. 25, 2016, 1:09 a.m. UTC
In 1999 the project split "localedir" into "localedir" (path to
compiled locale archives) and "msgcatdir" (path to message
catalogs). This predates the 2002 change in the GNU Coding
Standard to document the use  of "localedir" for the path to the 
message catalogs. It appears that newlib, gcc, and several
other projects also used "msgcatdir" at one point or another
in the past, and so it is in line with historical precedent that
glibc would also use "msgcatdir." However, given that the GNU
Coding Standard uses "localedir", we will switch to that for
consistency as a GNU project. Previous uses of --localdir didn't
work anyway (see bug 14259).

I am committing this patch in the understanding that nobody
would object to fixing #14259 as part of aligning our variable
usage to the GNU Coding Standard.

Given that previous "localedir" uses were converted to "complocaledir"
by [1], we can now convert "msgcatdir" to "localedir" and complete the
transition. With an addition to config.make.in we also fix
bug 14259 and allow users to specify the locale dependent data
directory with "--localedir" at configure time. There is still no way
to control at configure time the location of the *compiled* locale
directory.

Tested on x86_64 with no regressions.

Tested using "--localedir" to specify alternate locale dependent data
directory and verified with "make install DESTDIR=/tmp/glibc".

[1] 90fe682d3067163aa773feecf497ef599429457a

2016-02-24  Carlos O'Donell  <carlos@redhat.com>
 
	[BZ #14259]
	* Makeconfig: Rename msgcatdir to localedir.
	Rename inst_msgcatdir to inst_localedir.
	* catgets/Makefile (catgets-CPPFLAGS): Use localedir.
	* config.make.in: Add localedir.
	* elf/Makefile ($(objpfx)sotruss): Use localedir.
	(ldd-rewrite): Likewise.
	* intl/Makefile: Rename inst_msgcatdir to inst_localedir.
	(install-others): Use inst_localedir.
	(CPPFLAGS): Use localedir.
	* locale/Makefile (locale-CPPFLAGS): Likewise.
	* po/Makefile (mo-installed): Use inst_localedir.

---

Cheers,
Carlos.
diff mbox

Patch

diff --git a/Makeconfig b/Makeconfig
index 87a22e8..901e253 100644
--- a/Makeconfig
+++ b/Makeconfig
@@ -199,10 +199,10 @@  inst_complocaledir = $(install_root)$(complocaledir)
 
 # Where to install the message catalog data files (which are
 # machine-independent).
-ifndef msgcatdir
-msgcatdir = $(datadir)/locale
+ifndef localedir
+localedir = $(datadir)/locale
 endif
-inst_msgcatdir = $(install_root)$(msgcatdir)
+inst_localedir = $(install_root)$(localedir)
 
 # Where to install the locale charmap source files.
 ifndef i18ndir
diff --git a/catgets/Makefile b/catgets/Makefile
index 0c6ac79..053b032 100644
--- a/catgets/Makefile
+++ b/catgets/Makefile
@@ -47,7 +47,7 @@  include ../Rules
 
 $(objpfx)gencat: $(gencat-modules:%=$(objpfx)%.o)
 
-catgets-CPPFLAGS := -DNLSPATH='"$(msgcatdir)/%L/%N:$(msgcatdir)/%L/LC_MESSAGES/%N:$(msgcatdir)/%l/%N:$(msgcatdir)/%l/LC_MESSAGES/%N:"'
+catgets-CPPFLAGS := -DNLSPATH='"$(localedir)/%L/%N:$(localedir)/%L/LC_MESSAGES/%N:$(localedir)/%l/%N:$(localedir)/%l/LC_MESSAGES/%N:"'
 
 generated += de.msg test1.cat test1.h test2.cat test2.h sample.SJIS.cat \
 	     test-gencat.h
diff --git a/config.make.in b/config.make.in
index 05ed6ec..95c6f36 100644
--- a/config.make.in
+++ b/config.make.in
@@ -20,6 +20,7 @@  infodir = @infodir@
 includedir = @includedir@
 datarootdir = @datarootdir@
 localstatedir = @libc_cv_localstatedir@
+localedir = @localedir@
 
 # Should we use and build ldconfig?
 use-ldconfig = @use_ldconfig@
diff --git a/elf/Makefile b/elf/Makefile
index 63a5355..2aacedf 100644
--- a/elf/Makefile
+++ b/elf/Makefile
@@ -105,7 +105,7 @@  $(objpfx)sotruss-lib.so: $(common-objpfx)libc.so $(objpfx)ld.so \
 $(objpfx)sotruss: sotruss.sh $(common-objpfx)config.make
 	sed -e 's%@BASH@%$(BASH)%g' \
 	    -e 's%@VERSION@%$(version)%g' \
-	    -e 's%@TEXTDOMAINDIR@%$(msgcatdir)%g' \
+	    -e 's%@TEXTDOMAINDIR@%$(localedir)%g' \
 	    -e 's%@PREFIX@%$(prefix)%g' \
 	    -e 's|@PKGVERSION@|$(PKGVERSION)|g' \
 	    -e 's|@REPORT_BUGS_TO@|$(REPORT_BUGS_TO)|g' \
@@ -436,7 +436,7 @@  ldd-rewrite = -e 's%@RTLD@%$(rtlddir)/$(rtld-installed-name)%g' \
 	      -e 's|@PKGVERSION@|$(PKGVERSION)|g' \
 	      -e 's|@REPORT_BUGS_TO@|$(REPORT_BUGS_TO)|g' \
 	      -e 's%@BASH@%$(BASH)%g' \
-	      -e 's%@TEXTDOMAINDIR@%$(msgcatdir)%g'
+	      -e 's%@TEXTDOMAINDIR@%$(localedir)%g'
 
 ifeq ($(ldd-rewrite-script),no)
 define gen-ldd
diff --git a/intl/Makefile b/intl/Makefile
index 4ef9198..96183b2 100644
--- a/intl/Makefile
+++ b/intl/Makefile
@@ -36,7 +36,7 @@  tests = tst-ngettext
 
 before-compile += $(objpfx)msgs.h
 
-install-others = $(inst_msgcatdir)/locale.alias
+install-others = $(inst_localedir)/locale.alias
 
 generated += msgs.h mtrace-tst-gettext.out tst-gettext.mtrace
 generated-dirs += domaindir localedir
@@ -149,9 +149,9 @@  $(objpfx)tst-gettext4.out: $(objpfx)tst-gettext.out
 $(objpfx)tst-gettext5.out: $(objpfx)tst-gettext.out
 $(objpfx)tst-gettext6.out: $(objpfx)tst-gettext.out
 
-CPPFLAGS += -D'LOCALEDIR="$(msgcatdir)"' \
-	    -D'LOCALE_ALIAS_PATH="$(msgcatdir)"'
+CPPFLAGS += -D'LOCALEDIR="$(localedir)"' \
+	    -D'LOCALE_ALIAS_PATH="$(localedir)"'
 BISONFLAGS = --yacc --name-prefix=__gettext --output
 
-$(inst_msgcatdir)/locale.alias: locale.alias $(+force)
+$(inst_localedir)/locale.alias: locale.alias $(+force)
 	$(do-install)
diff --git a/locale/Makefile b/locale/Makefile
index 22e0c85..c5379e6 100644
--- a/locale/Makefile
+++ b/locale/Makefile
@@ -85,7 +85,7 @@  localepath = "$(complocaledir):$(i18ndir)"
 # of the list instead of the tail, where CPPFLAGS-$(lib) gets added.
 # We need it before the standard -I's to see programs/config.h first.
 locale-CPPFLAGS = -DCOMPLOCALEDIR='"$(complocaledir)"' \
-		  -DLOCALE_ALIAS_PATH='"$(msgcatdir)"' \
+		  -DLOCALE_ALIAS_PATH='"$(localedir)"' \
 		  -Iprograms
 
 CPPFLAGS-locale-programs = -DLOCALE_PATH='$(localepath)' \
diff --git a/po/Makefile b/po/Makefile
index 3585126..df053d8 100644
--- a/po/Makefile
+++ b/po/Makefile
@@ -39,7 +39,7 @@  endif
 domainname = libc
 
 # Pattern for where message catalog object for language % gets installed.
-mo-installed = $(inst_msgcatdir)/%/LC_MESSAGES/$(domainname).mo
+mo-installed = $(inst_localedir)/%/LC_MESSAGES/$(domainname).mo
 
 # Files to install: a $(domainname).mo file for each language.
 install-others = $(LINGUAS:%=$(mo-installed))