Hiroyuki Komatsu
komat****@users*****
2005年 3月 8日 (火) 21:34:55 JST
Index: prime/ChangeLog diff -u prime/ChangeLog:1.55.4.52 prime/ChangeLog:1.55.4.53 --- prime/ChangeLog:1.55.4.52 Tue Mar 8 20:48:53 2005 +++ prime/ChangeLog Tue Mar 8 21:34:55 2005 @@ -2,6 +2,12 @@ * PRIME 0.9.4.1: + * 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.6.4.4 prime/Makefile.am:1.6.4.5 --- prime/Makefile.am:1.6.4.4 Sun Jan 16 04:47:16 2005 +++ prime/Makefile.am Tue Mar 8 21:34:55 2005 @@ -1,5 +1,5 @@ # Makefile.am: Template of Automake for prime. -# $Id: Makefile.am,v 1.6.4.4 2005/01/15 19:47:16 komatsu Exp $ +# $Id: Makefile.am,v 1.6.4.5 2005/03/08 12:34:55 komatsu Exp $ # # Copyright (C) 2003 Hiroyuki Komatsu <komat****@taiya*****> # All rights reserved. @@ -8,7 +8,7 @@ # You can redistribute it and/or modify it under the terms of # the GNU General Public License version 2. -SUBDIRS = doc etc grammar lib src packaging +SUBDIRS = doc etc grammar lib src packaging uim EXTRA_DIST = autogen.sh prime.spec prime.spec.in prime.pc.in pkgconfigdir = $(libdir)/pkgconfig @@ -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.3.4.1 prime/acinclude.m4:1.3.4.2 --- prime/acinclude.m4:1.3.4.1 Fri Dec 31 05:15:26 2004 +++ prime/acinclude.m4 Tue Mar 8 21:34:55 2005 @@ -1,5 +1,5 @@ dnl acinclude.m4: m4 macros for Autoconf -dnl $Id: acinclude.m4,v 1.3.4.1 2004/12/30 20:15:26 komatsu Exp $ +dnl $Id: acinclude.m4,v 1.3.4.2 2005/03/08 12:34:55 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.15.4.22 prime/configure.in:1.15.4.23 --- prime/configure.in:1.15.4.22 Tue Mar 8 20:48:53 2005 +++ prime/configure.in Tue Mar 8 21:34:55 2005 @@ -1,5 +1,5 @@ dnl configure.in: Creates a configure script for prime of PRIME. -dnl $Id: configure.in,v 1.15.4.22 2005/03/08 11:48:53 komatsu Exp $ +dnl $Id: configure.in,v 1.15.4.23 2005/03/08 12:34:55 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, @@ -60,7 +61,7 @@ # Output of configure files AC_CONFIG_FILES([Makefile src/Makefile grammar/Makefile lib/Makefile lib/engine/Makefile lib/grammar/Makefile lib/makedict/Makefile - etc/Makefile doc/Makefile doc/figures/Makefile + etc/Makefile uim/Makefile doc/Makefile doc/figures/Makefile doc/figures/src/Makefile doc/memo/Makefile lib/prime-config.rb prime.pc prime.spec packaging/Debian/debian/Makefile
