diff options
| author | Rodney Dawes <dobey@wayofthemonkey.com> | 2013-05-12 13:08:09 -0400 |
|---|---|---|
| committer | Rodney Dawes <dobey@wayofthemonkey.com> | 2013-05-12 13:08:09 -0400 |
| commit | 10c06017958385563ca6aa5d62fc366f0389e95e (patch) | |
| tree | 40931eed1636d0a54d7dcefc955fb22c57582cf4 | |
| parent | 0e7682616e7d7e0b77c927fbe705262f1cfae264 (diff) | |
| download | intltool-10c06017958385563ca6aa5d62fc366f0389e95e.tar.gz | |
Use plain localedir to install mo files to, rather than trying to guess one.
| -rw-r--r-- | Makefile.in.in | 9 | ||||
| -rw-r--r-- | intltool.m4 | 25 |
2 files changed, 4 insertions, 30 deletions
diff --git a/Makefile.in.in b/Makefile.in.in index 06a8cfe..01f9702 100644 --- a/Makefile.in.in +++ b/Makefile.in.in @@ -33,8 +33,7 @@ exec_prefix = @exec_prefix@ datadir = @datadir@ datarootdir = @datarootdir@ libdir = @libdir@ -DATADIRNAME = @DATADIRNAME@ -itlocaledir = $(prefix)/$(DATADIRNAME)/locale +localedir = @localedir@ subdir = po install_sh = @install_sh@ # Automake >= 1.8 provides @mkdir_p@. @@ -108,7 +107,7 @@ install-data-no: all install-data-yes: all linguas="$(USE_LINGUAS)"; \ for lang in $$linguas; do \ - dir=$(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES; \ + dir=$(DESTDIR)$(localedir)/$$lang/LC_MESSAGES; \ $(mkdir_p) $$dir; \ if test -r $$lang.gmo; then \ $(INSTALL_DATA) $$lang.gmo $$dir/$(GETTEXT_PACKAGE).mo; \ @@ -142,8 +141,8 @@ install-exec installcheck: uninstall: linguas="$(USE_LINGUAS)"; \ for lang in $$linguas; do \ - rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo; \ - rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo.m; \ + rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo; \ + rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo.m; \ done check: all $(GETTEXT_PACKAGE).pot diff --git a/intltool.m4 b/intltool.m4 index 33353ed..c25b7b1 100644 --- a/intltool.m4 +++ b/intltool.m4 @@ -155,31 +155,6 @@ fi # Substitute ALL_LINGUAS so we can use it in po/Makefile AC_SUBST(ALL_LINGUAS) -# Set DATADIRNAME correctly if it is not set yet -# (copied from glib-gettext.m4) -if test -z "$DATADIRNAME"; then - AC_LINK_IFELSE( - [AC_LANG_PROGRAM([[]], - [[extern int _nl_msg_cat_cntr; - return _nl_msg_cat_cntr]])], - [DATADIRNAME=share], - [case $host in - *-*-solaris*) - dnl On Solaris, if bind_textdomain_codeset is in libc, - dnl GNU format message catalog is always supported, - dnl since both are added to the libc all together. - dnl Hence, we'd like to go with DATADIRNAME=share - dnl in this case. - AC_CHECK_FUNC(bind_textdomain_codeset, - [DATADIRNAME=share], [DATADIRNAME=lib]) - ;; - *) - [DATADIRNAME=lib] - ;; - esac]) -fi -AC_SUBST(DATADIRNAME) - IT_PO_SUBDIR([po]) ]) |