From: Bruno Haible <bruno@clisp.org>
Date: Sat, 29 Jul 2000 00:01:35 +0000 (+0000)
Subject: Remove unneeded gnulocaledir variable.
X-Git-Tag: v0.10.36~238
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=524677702f53ef2a6e62d1dc86d0fda40ae7298a;p=thirdparty%2Fgettext.git

Remove unneeded gnulocaledir variable.
---

diff --git a/intl/ChangeLog b/intl/ChangeLog
index c2da76667..0742de317 100644
--- a/intl/ChangeLog
+++ b/intl/ChangeLog
@@ -1,3 +1,10 @@
+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 ...
diff --git a/intl/Makefile.in b/intl/Makefile.in
index 7ab00178f..767ce93bf 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 c10f42059..9f38b1b91 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.  */
diff --git a/po/ChangeLog b/po/ChangeLog
index 8fc93cc81..e2b6502ae 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,10 @@
+2000-07-28  Bruno Haible  <haible@clisp.cons.org>
+
+	Simplification: In all cases where $(gnulocaledir) is used, it is
+	identical to $(localedir).
+	* Makefile.in.in (install, uninstall): Use $(localedir) instead of
+	$(gnulocaledir).
+
 1998-07-24  Paul Eggert  <eggert@twinsun.com>
 
 	* Makefile.in.in (cat-id-tbl.o): Depend on
diff --git a/po/Makefile.in.in b/po/Makefile.in.in
index ea0595506..345f89802 100644
--- a/po/Makefile.in.in
+++ b/po/Makefile.in.in
@@ -21,7 +21,6 @@ prefix = @prefix@
 exec_prefix = @exec_prefix@
 datadir = $(prefix)/@DATADIRNAME@
 localedir = $(datadir)/locale
-gnulocaledir = $(prefix)/share/locale
 gettextsrcdir = $(prefix)/share/gettext/po
 subdir = po
 
@@ -116,12 +115,8 @@ install-data-yes: all
 	@catalogs='$(CATALOGS)'; \
 	for cat in $$catalogs; do \
 	  cat=`basename $$cat`; \
-	  case "$$cat" in \
-	    *.gmo) destdir=$(gnulocaledir);; \
-	    *)     destdir=$(localedir);; \
-	  esac; \
 	  lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
-	  dir=$$destdir/$$lang/LC_MESSAGES; \
+	  dir=$(localedir)/$$lang/LC_MESSAGES; \
 	  $(mkinstalldirs) $(DESTDIR)$$dir; \
 	  if test -r $$cat; then \
 	    $(INSTALL_DATA) $$cat $(DESTDIR)$$dir/$(PACKAGE)$(INSTOBJEXT); \
@@ -162,13 +157,9 @@ uninstall:
 	catalogs='$(CATALOGS)'; \
 	for cat in $$catalogs; do \
 	  cat=`basename $$cat`; \
-	  case "$$cat" in \
-	    *.gmo) destdir=$(gnulocaledir);; \
-	    *)     destdir=$(localedir);; \
-	  esac; \
 	  lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
-	  rm -f $(DESTDIR)$$destdir/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT); \
-	  rm -f $(DESTDIR)$$destdir/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT).m; \
+	  rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT); \
+	  rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT).m; \
 	done
 	if test "$(PACKAGE)" = "gettext"; then \
 	  rm -f $(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \