intltool

Merge lp:~dobey/intltool/localedir-fix into lp:intltool

  1. localedir-fix
  2. Merge into trunk
Proposed by dobey
Status: Merged
Merged at revision: 742
Proposed branch: lp:~dobey/intltool/localedir-fix
Merge into: lp:intltool
Diff against target: 69 lines (+4/-30)
2 files modified
Makefile.in.in (+4/-5)
intltool.m4 (+0/-25)
To merge this branch: bzr merge lp:~dobey/intltool/localedir-fix
Reviewer Review Type Date Requested Status
intltool Developers Pending
Review via email: mp+163435@code.launchpad.net

Commit message

Use plain localedir to install mo files to, rather than trying to guess one.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Makefile.in.in'
2--- Makefile.in.in 2012-01-18 16:37:06 +0000
3+++ Makefile.in.in 2013-05-12 17:12:40 +0000
4@@ -33,8 +33,7 @@
5 datadir = @datadir@
6 datarootdir = @datarootdir@
7 libdir = @libdir@
8-DATADIRNAME = @DATADIRNAME@
9-itlocaledir = $(prefix)/$(DATADIRNAME)/locale
10+localedir = @localedir@
11 subdir = po
12 install_sh = @install_sh@
13 # Automake >= 1.8 provides @mkdir_p@.
14@@ -108,7 +107,7 @@
15 install-data-yes: all
16 linguas="$(USE_LINGUAS)"; \
17 for lang in $$linguas; do \
18- dir=$(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES; \
19+ dir=$(DESTDIR)$(localedir)/$$lang/LC_MESSAGES; \
20 $(mkdir_p) $$dir; \
21 if test -r $$lang.gmo; then \
22 $(INSTALL_DATA) $$lang.gmo $$dir/$(GETTEXT_PACKAGE).mo; \
23@@ -142,8 +141,8 @@
24 uninstall:
25 linguas="$(USE_LINGUAS)"; \
26 for lang in $$linguas; do \
27- rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo; \
28- rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo.m; \
29+ rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo; \
30+ rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo.m; \
31 done
32
33 check: all $(GETTEXT_PACKAGE).pot
34
35=== modified file 'intltool.m4'
36--- intltool.m4 2012-02-20 14:50:33 +0000
37+++ intltool.m4 2013-05-12 17:12:40 +0000
38@@ -155,31 +155,6 @@
39 # Substitute ALL_LINGUAS so we can use it in po/Makefile
40 AC_SUBST(ALL_LINGUAS)
41
42-# Set DATADIRNAME correctly if it is not set yet
43-# (copied from glib-gettext.m4)
44-if test -z "$DATADIRNAME"; then
45- AC_LINK_IFELSE(
46- [AC_LANG_PROGRAM([[]],
47- [[extern int _nl_msg_cat_cntr;
48- return _nl_msg_cat_cntr]])],
49- [DATADIRNAME=share],
50- [case $host in
51- *-*-solaris*)
52- dnl On Solaris, if bind_textdomain_codeset is in libc,
53- dnl GNU format message catalog is always supported,
54- dnl since both are added to the libc all together.
55- dnl Hence, we'd like to go with DATADIRNAME=share
56- dnl in this case.
57- AC_CHECK_FUNC(bind_textdomain_codeset,
58- [DATADIRNAME=share], [DATADIRNAME=lib])
59- ;;
60- *)
61- [DATADIRNAME=lib]
62- ;;
63- esac])
64-fi
65-AC_SUBST(DATADIRNAME)
66-
67 IT_PO_SUBDIR([po])
68
69 ])

Subscribers

People subscribed via source and target branches

to all changes: