From 0eba1ce27447610355e62e1e568f81602d6962a1 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Mon, 15 May 2017 18:22:29 +0200 Subject: [PATCH] Respect the configure option --localedir. Reported by Markus Gothe at https://savannah.gnu.org/bugs/index.php?49862 . The AC_SUBSTed variable @localedir@ is supported since Autoconf 2.60. * gettext-runtime/intl/Makefile.in (localedir): Set to @localedir@. Suggested by Markus Gothe . * gettext-runtime/m4/intldir.m4: Require Autoconf 2.60 or newer. * gettext-tools/doc/gettext.texi (src/Makefile): Assume Autoconf 2.60 or newer. --- gettext-runtime/intl/Makefile.in | 4 ++-- gettext-runtime/m4/intldir.m4 | 6 +++--- gettext-tools/doc/gettext.texi | 14 +++----------- 3 files changed, 8 insertions(+), 16 deletions(-) diff --git a/gettext-runtime/intl/Makefile.in b/gettext-runtime/intl/Makefile.in index 961a04287..3f2b185be 100644 --- a/gettext-runtime/intl/Makefile.in +++ b/gettext-runtime/intl/Makefile.in @@ -1,5 +1,5 @@ # Makefile for directory with message catalog handling library of GNU gettext -# Copyright (C) 1995-1998, 2000-2007, 2009-2016 Free Software Foundation, Inc. +# Copyright (C) 1995-1998, 2000-2007, 2009-2017 Free Software Foundation, Inc. # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Lesser General Public License as published by @@ -42,7 +42,7 @@ libdir = @libdir@ includedir = @includedir@ datarootdir = @datarootdir@ datadir = @datadir@ -localedir = $(datadir)/locale +localedir = @localedir@ gettextsrcdir = $(datadir)/gettext/intl aliaspath = $(localedir) subdir = intl diff --git a/gettext-runtime/m4/intldir.m4 b/gettext-runtime/m4/intldir.m4 index c688f4695..8d74bda4c 100644 --- a/gettext-runtime/m4/intldir.m4 +++ b/gettext-runtime/m4/intldir.m4 @@ -1,5 +1,5 @@ -# intldir.m4 serial 2 (gettext-0.18) -dnl Copyright (C) 2006, 2009-2014, 2016 Free Software Foundation, Inc. +# intldir.m4 serial 3 (gettext-0.19.9) +dnl Copyright (C) 2006, 2009-2014, 2016-2017 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -13,7 +13,7 @@ dnl by the GNU Library General Public License, and the rest of the GNU dnl gettext package is covered by the GNU General Public License. dnl They are *not* in the public domain. -AC_PREREQ([2.52]) +AC_PREREQ([2.60]) dnl Tells the AM_GNU_GETTEXT macro to consider an intl/ directory. AC_DEFUN([AM_GNU_GETTEXT_INTL_SUBDIR], []) diff --git a/gettext-tools/doc/gettext.texi b/gettext-tools/doc/gettext.texi index 2b5e29535..03bdf1d57 100644 --- a/gettext-tools/doc/gettext.texi +++ b/gettext-tools/doc/gettext.texi @@ -79,7 +79,7 @@ This file provides documentation for GNU @code{gettext} utilities. It also serves as a reference for the free Translation Project. @copying -Copyright (C) 1995-1998, 2001-2016 Free Software Foundation, Inc. +Copyright (C) 1995-1998, 2001-2017 Free Software Foundation, Inc. This manual is free documentation. It is dually licensed under the GNU FDL and the GNU GPL. This means that you can redistribute this @@ -8233,7 +8233,7 @@ textdomain (@var{PACKAGE}); @end example To make LOCALEDIR known to the program, add the following lines to -@file{Makefile.in} if you are using Autoconf version 2.60 or newer: +@file{Makefile.in}: @example datadir = @@datadir@@ @@ -8242,15 +8242,7 @@ localedir = @@localedir@@ DEFS = -DLOCALEDIR=\"$(localedir)\" @@DEFS@@ @end example -or these lines if your version of Autoconf is older than 2.60: - -@example -datadir = @@datadir@@ -localedir = $(datadir)/locale -DEFS = -DLOCALEDIR=\"$(localedir)\" @@DEFS@@ -@end example - -Note that @code{@@datadir@@} defaults to @samp{$(prefix)/share}, thus +Note that @code{@@datadir@@} defaults to @samp{$(prefix)/share}, and @code{$(localedir)} defaults to @samp{$(prefix)/share/locale}. @item -- 2.47.3