summaryrefslogtreecommitdiffstats
path: root/intl
diff options
context:
space:
mode:
authorBruno Haible <bruno@clisp.org>2000-07-29 00:01:35 +0000
committerBruno Haible <bruno@clisp.org>2000-07-29 00:01:35 +0000
commit524677702f53ef2a6e62d1dc86d0fda40ae7298a (patch)
treee0452189696ca3d960a4d9fc0de5502b76ebdf79 /intl
parent3a598c9e2c973ab04fce6ebb5342a0f9241478fc (diff)
downloadexternal_gettext-524677702f53ef2a6e62d1dc86d0fda40ae7298a.zip
external_gettext-524677702f53ef2a6e62d1dc86d0fda40ae7298a.tar.gz
external_gettext-524677702f53ef2a6e62d1dc86d0fda40ae7298a.tar.bz2
Remove unneeded gnulocaledir variable.
Diffstat (limited to 'intl')
-rw-r--r--intl/ChangeLog7
-rw-r--r--intl/Makefile.in5
-rw-r--r--intl/dcigettext.c2
3 files changed, 10 insertions, 4 deletions
diff --git a/intl/ChangeLog b/intl/ChangeLog
index c2da766..0742de3 100644
--- a/intl/ChangeLog
+++ b/intl/ChangeLog
@@ -1,5 +1,12 @@
2000-07-28 Bruno Haible <haible@clisp.cons.org>
+ Simplification: In all cases where $(gnulocaledir) is used, it is
+ identical to $(localedir).
+ * Makefile.in (DEFS): Remove setting for GNULOCALEDIR.
+ * dcigettext.c (_nl_default_dirname): Initialize with LOCALEDIR.
+
+2000-07-28 Bruno Haible <haible@clisp.cons.org>
+
* xopen-msg.sed: Renamed to ...
* po2msg.sin: ... here.
* linux-msg.sed: Remove file.
diff --git a/intl/Makefile.in b/intl/Makefile.in
index 7ab0017..767ce93 100644
--- a/intl/Makefile.in
+++ b/intl/Makefile.in
@@ -32,7 +32,6 @@ libdir = $(exec_prefix)/lib
includedir = $(prefix)/include
datadir = $(prefix)/@DATADIRNAME@
localedir = $(datadir)/locale
-gnulocaledir = $(prefix)/share/locale
gettextsrcdir = @datadir@/gettext/intl
aliaspath = $(localedir)
subdir = intl
@@ -51,8 +50,8 @@ RANLIB = @RANLIB@
YACC = @YACC@ -d
YFLAGS = --name-prefix=__gettext
-DEFS = -DLOCALEDIR=\"$(localedir)\" -DGNULOCALEDIR=\"$(gnulocaledir)\" \
--DLOCALE_ALIAS_PATH=\"$(aliaspath)\" -DLIBDIR=\"$(libdir)\" @DEFS@
+DEFS = -DLOCALEDIR=\"$(localedir)\" -DLOCALE_ALIAS_PATH=\"$(aliaspath)\" \
+-DLIBDIR=\"$(libdir)\" @DEFS@
CPPFLAGS = @CPPFLAGS@
CFLAGS = @CFLAGS@
LDFLAGS = @LDFLAGS@
diff --git a/intl/dcigettext.c b/intl/dcigettext.c
index c10f420..9f38b1b 100644
--- a/intl/dcigettext.c
+++ b/intl/dcigettext.c
@@ -261,7 +261,7 @@ const char _nl_default_default_domain[] = "messages";
const char *_nl_current_default_domain = _nl_default_default_domain;
/* Contains the default location of the message catalogs. */
-const char _nl_default_dirname[] = GNULOCALEDIR;
+const char _nl_default_dirname[] = LOCALEDIR;
/* List with bindings of specific domains created by bindtextdomain()
calls. */