MOO_INTLTOOL_INI_RULE

configure.ac

@@ -14,12 +14,7 @@ AC_CANONICAL_HOST
 AC_CONFIG_HEADERS(config.h)
 MOO_DEFINE_VERSIONS
 
-AC_PROG_INTLTOOL([0.29])
+MOO_AC_I18N([ru])
-GETTEXT_PACKAGE=moo
-AC_SUBST(GETTEXT_PACKAGE)
-AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Name of the gettext package.])
-ALL_LINGUAS="ru"
-AM_GLIB_GNU_GETTEXT
 
 AM_CONDITIONAL(MOO_INSTALL_LIB, false)
 AC_DISABLE_SHARED

m4/moo-i18n.m4

@@ -0,0 +1,16 @@
+##############################################################################
+# MOO_AC_I18N
+#
+AC_DEFUN([MOO_AC_I18N],[
+    AC_PROG_INTLTOOL([0.29])
+
+    GETTEXT_PACKAGE=moo
+    AC_SUBST(GETTEXT_PACKAGE)
+    AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Name of the gettext package.])
+
+    ALL_LINGUAS="$1"
+    AM_GLIB_GNU_GETTEXT
+
+    MOO_INTLTOOL_INI_RULE='%.ini: %.ini.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; cp $< [$]@.desktop.in && LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po [$]@.desktop.in [$]@ && rm [$]@.desktop.in'
+    AC_SUBST(MOO_INTLTOOL_INI_RULE)
+])

moo/moopython/plugins/Makefile.am

@@ -3,9 +3,10 @@ SUBDIRS = pyproject
 moopython_pluginsdir = $(MOO_LIB_DIR)/plugins
 moopython_plugins_libdir = $(MOO_LIB_DIR)/plugins/lib
 
-ini_in_files = console.ini.desktop.in python.ini.desktop.in
+ini_in_files = console.ini.in python.ini.in
-%.ini:   %.ini.desktop.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@
+@MOO_INTLTOOL_INI_RULE@
-ini_files = $(ini_in_files:.ini.desktop.in=.ini)
+ini_files = $(ini_in_files:.ini.in=.ini)
+CLEANFILES = $(ini_files)
 
 plugins =			\
 	console.py		\
@@ -22,5 +23,3 @@ EXTRA_DIST =				\
     $(moopython_plugins_lib_DATA)	\
     $(plugins)				\
     $(ini_in_files)
-
-CLEANFILES = $(ini_files)

moo/moopython/plugins/pyproject/Makefile.am

@@ -1,6 +1,6 @@
-ini_in_files = project-plugin.ini.desktop.in
+ini_in_files = project-plugin.ini.in
-%.ini:   %.ini.desktop.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@
+@MOO_INTLTOOL_INI_RULE@
-ini_files = $(ini_in_files:.ini.desktop.in=.ini)
+ini_files = $(ini_in_files:.ini.in=.ini)
 CLEANFILES = $(ini_files)
 
 inidir = $(MOO_LIB_DIR)/plugins