Revision: 3c4be2577760
Author: Etsushi Kato <ek.k...@gmail.com>
Date: Mon Apr 30 19:43:24 2012
Log: * gtk3/immodule/Makefile.am : Use --update-cache option for
gtk-query-immodule-3.0, and fix to use correct environment
variable.
http://code.google.com/p/uim/source/detail?r=3c4be2577760
Modified:
/gtk3/immodule/Makefile.am
=======================================
--- /gtk3/immodule/Makefile.am Sat Oct 22 19:29:57 2011
+++ /gtk3/immodule/Makefile.am Mon Apr 30 19:43:24 2012
@@ -1,5 +1,4 @@
uim_gtk3_im_module_path = $(libdir)/gtk-3.0
-uim_gtk3_im_module_file = $(DESTDIR)$(sysconfdir)/gtk-3.0/gtk.immodules
moduledir = $(uim_gtk3_im_module_path)/@GTK3_BINARY_VERSION@/immodules
@@ -48,7 +47,7 @@
if test -z $(DESTDIR); then \
if test $(libdir) = $(GTK3_LIBDIR); then \
if type $(QUERY_COMMAND) > /dev/null 2>&1; then \
- $(QUERY_COMMAND) > `$(GTK3_RC_GET_IMMODULE_FILE)`; \
+ $(QUERY_COMMAND) --update-cache; \
echo "*** \"`$(GTK3_RC_GET_IMMODULE_FILE)`\" is updated. ***"; \
else \
echo "********************** Warning ***********************"; \
@@ -60,20 +59,14 @@
fi \
else \
if type $(QUERY_COMMAND) > /dev/null 2>&1; then \
- $(mkinstalldirs) $(sysconfdir)/gtk-3.0; \
- GTK3_PATH=$(uim_gtk3_im_module_path) $(QUERY_COMMAND) >
$(uim_gtk3_im_module_file); \
- echo "******************************************************"; \
- echo " You need to set"; \
- echo " GTK3_IM_MODULE_FILE=$(uim_gtk3_im_module_file)"; \
- echo " environment variable to use this module."; \
- echo "******************************************************"; \
+ GTK_PATH=$(uim_gtk3_im_module_path) $(QUERY_COMMAND)
--update-cache; \
else \
echo "********************** Warning ***********************"; \
echo " $(QUERY_COMMAND) not found"; \
echo " Please make sure to update"; \
- echo " \"$(uim_gtk3_im_module_file)\""; \
+ echo " immodules.cache"; \
echo " manually, and set"; \
- echo " GTK3_IM_MODULE_FILE=$(uim_gtk3_im_module_file)"; \
+ echo " GTK_IM_MODULE_FILE=PATH_TO/immodule.cache"; \
echo " environment variable to use this module."; \
echo "******************************************************"; \
fi \
@@ -83,9 +76,9 @@
if test -z $(DESTDIR); then \
if type $(QUERY_COMMAND) > /dev/null 2>&1; then \
if test $(libdir) = $(GTK3_LIBDIR); then \
- $(QUERY_COMMAND) > `$(GTK3_RC_GET_IMMODULE_FILE)`; \
+ $(QUERY_COMMAND) --update-cache; \
else \
- GTK3_PATH=$(uim_gtk3_im_module_path) $(QUERY_COMMAND) >
$(uim_gtk3_im_module_file); \
+ GTK_PATH=$(uim_gtk3_im_module_path) $(QUERY_COMMAND)
--update-cache; \
fi \
fi \
fi
