Remove unneeded gnulocaledir variable.

diff --git a/intl/ChangeLog b/intl/ChangeLog
index c2da76667c8ef95af31344d7f4650336f419ce39..0742de317fa913dcc930280c0043d527146f04b3 100644 (file)
--- 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 7ab00178f43095dcb878baad56dcff97708ce91a..767ce93bf4fdd068e8ea8f887d3339759e7d01bd 100644 (file)
--- 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 c10f42059325c904202aed4eac8eb06d7b09307a..9f38b1b91170bd7fed72570891b481c5e05b44e1 100644 (file)
--- 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 8fc93cc81b011b97b8af46138201d07a61d0ae66..e2b6502aee0975753919e945a120529687f78bb8 100644 (file)
--- 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 ea05955068cd6a48727d58f4d9e2fe395f44caa0..345f89802a07b230c32a17a0df217f63ef737bf4 100644 (file)
--- 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; \