Hiroyuki Komatsu
komat****@users*****
2005年 3月 8日 (火) 21:36:21 JST
Index: prime/ChangeLog diff -u prime/ChangeLog:1.81.2.3 prime/ChangeLog:1.81.2.4 --- prime/ChangeLog:1.81.2.3 Tue Mar 8 20:50:39 2005 +++ prime/ChangeLog Tue Mar 8 21:36:20 2005 @@ -2,6 +2,12 @@ * PRIME 1.0.0-rc2: + * Makefile.am: + A new command install-uim to install uim-prime files. + + * acinclude.m4: + A new procedure MY_AC_PROG_UIM to get the variable uim_scheme_dir. + * lib/session-japanese.rb: Fixed the critical bug that the lowest priority candidate will be returned. Index: prime/Makefile.am diff -u prime/Makefile.am:1.8.2.1 prime/Makefile.am:1.8.2.2 --- prime/Makefile.am:1.8.2.1 Mon Mar 7 17:52:00 2005 +++ prime/Makefile.am Tue Mar 8 21:36:20 2005 @@ -1,5 +1,5 @@ # Makefile.am: Template of Automake for prime. -# $Id: Makefile.am,v 1.8.2.1 2005/03/07 08:52:00 komatsu Exp $ +# $Id: Makefile.am,v 1.8.2.2 2005/03/08 12:36:20 komatsu Exp $ # # Copyright (C) 2003 - 2005 Hiroyuki Komatsu <komat****@taiya*****> # All rights reserved. @@ -20,6 +20,9 @@ uninstall-etc: (cd etc && $(MAKE) $(AM_MAKEFLAGS) uninstall-etc) +install-uim: + (cd uim && $(MAKE) $(AM_MAKEFLAGS) install-uim) + rpm: $(MAKE) dist rpmbuild -ta --clean $(PACKAGE)-$(VERSION).tar.gz Index: prime/acinclude.m4 diff -u prime/acinclude.m4:1.5 prime/acinclude.m4:1.5.2.1 --- prime/acinclude.m4:1.5 Mon Mar 7 16:51:31 2005 +++ prime/acinclude.m4 Tue Mar 8 21:36:20 2005 @@ -1,5 +1,5 @@ dnl acinclude.m4: m4 macros for Autoconf -dnl $Id: acinclude.m4,v 1.5 2005/03/07 07:51:31 komatsu Exp $ +dnl $Id: acinclude.m4,v 1.5.2.1 2005/03/08 12:36:20 komatsu Exp $ dnl dnl Copyright (C) 2003, 2004 Hiroyuki Komatsu <komat****@taiya*****> dnl All rights reserved. @@ -25,3 +25,9 @@ AC_DEFUN([AC_RUBY_SITELIBDIR], ['$(libdir)/site_ruby/$(ruby_version)']) # [`ruby -r rbconfig -e "puts Config::MAKEFILE_CONFIG[['rubylibdir']]"`]) + +AC_DEFUN([MY_AC_PROG_UIM], +[ + AC_SUBST(uim_scheme_dir, + [`pkg-config uim --variable=prefix`"/share/uim"]) +]) Index: prime/configure.in diff -u prime/configure.in:1.28.2.3 prime/configure.in:1.28.2.4 --- prime/configure.in:1.28.2.3 Tue Mar 8 20:50:39 2005 +++ prime/configure.in Tue Mar 8 21:36:20 2005 @@ -1,5 +1,5 @@ dnl configure.in: Creates a configure script for prime of PRIME. -dnl $Id: configure.in,v 1.28.2.3 2005/03/08 11:50:39 komatsu Exp $ +dnl $Id: configure.in,v 1.28.2.4 2005/03/08 12:36:20 komatsu Exp $ dnl dnl Copyright (C) 2003 Hiroyuki Komatsu <komat****@taiya*****> dnl All rights reserved. @@ -19,6 +19,7 @@ AC_SUBST(DATE, "2004-03-08") MY_AC_PROG_RUBY +MY_AC_PROG_UIM # Checks for user options. AC_ARG_WITH(rubydir,
