You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
70 lines
2.1 KiB
70 lines
2.1 KiB
=== modified file 'Makefile.in.in' |
|
--- Makefile.in.in 2013-05-12 18:38:08 +0000 |
|
+++ Makefile.in.in 2013-05-22 13:43:26 +0000 |
|
@@ -33,8 +33,7 @@ |
|
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-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 @@ |
|
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 |
|
|
|
=== modified file 'intltool.m4' |
|
--- intltool.m4 2012-02-20 14:50:33 +0000 |
|
+++ intltool.m4 2013-05-12 17:08:09 +0000 |
|
@@ -155,31 +155,6 @@ |
|
# 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]) |
|
|
|
]) |
|
|
|
|