From 70887edf11fa4af995c720b338e0f2fdb89f447d Mon Sep 17 00:00:00 2001 From: Inhong Han Date: Thu, 16 Nov 2023 19:02:36 +0900 Subject: [PATCH] Revert "Revert "Fix for ISF manifest DB change."" This reverts commit 540d4c202fafadedd18350e7c7488307a9ecd2cc. Change-Id: Ic230205faade1e30fc31533b9491aa6954a014ac --- Makefile.am | 3 +++ configure.ac | 6 ++++++ ise-engine-anthy.xml | 13 +++++++++++++ packaging/ise-engine-anthy.spec | 1 + 4 files changed, 23 insertions(+) create mode 100755 ise-engine-anthy.xml diff --git a/Makefile.am b/Makefile.am index a8efc89..4136a33 100755 --- a/Makefile.am +++ b/Makefile.am @@ -20,3 +20,6 @@ SUBDIRS = intl po m4 src data ACLOCAL_AMFLAGS = -I m4 EXTRA_DIST = config.rpath + +pkgdir = $(SCIM_PKGDIR) +pkg_DATA = ise-engine-anthy.xml diff --git a/configure.ac b/configure.ac index bd0d364..00897f1 100755 --- a/configure.ac +++ b/configure.ac @@ -123,6 +123,7 @@ AC_SUBST(SCIM_DEBUG_FLAGS) SCIM_DATADIR=`$PKG_CONFIG --variable=scimdatadir scim` SCIM_ICONDIR=`$PKG_CONFIG --variable=icondir scim` +SCIM_PKGDIR=`$PKG_CONFIG --variable=pkgdir scim` SCIM_MODULEDIR=`$PKG_CONFIG --variable=moduledir scim` if test "x$SCIM_DATADIR" = "x"; then @@ -133,6 +134,10 @@ if test "x$SCIM_ICONDIR" = "x"; then SCIM_ICONDIR=${datadir}/scim/icons fi +if test "x$SCIM_PKGDIR" = "x"; then + SCIM_PKGDIR=${datadir}/packages +fi + if test "x$SCIM_MODULEDIR" = "x"; then SCIM_MODULEDIR=${libdir}/scim-1.0 fi @@ -141,6 +146,7 @@ SCIM_ANTHY_DATADIR=${SCIM_DATADIR}/Anthy AC_SUBST(SCIM_DATADIR) AC_SUBST(SCIM_ICONDIR) +AC_SUBST(SCIM_PKGDIR) AC_SUBST(SCIM_MODULEDIR) AC_SUBST(SCIM_ANTHY_DATADIR) diff --git a/ise-engine-anthy.xml b/ise-engine-anthy.xml new file mode 100755 index 0000000..7a0d99d --- /dev/null +++ b/ise-engine-anthy.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/packaging/ise-engine-anthy.spec b/packaging/ise-engine-anthy.spec index cc70365..81a8611 100644 --- a/packaging/ise-engine-anthy.spec +++ b/packaging/ise-engine-anthy.spec @@ -43,5 +43,6 @@ rm -rf %{buildroot} %license COPYING %{_datadir}/scim/icons/* %{_datadir}/locale/* +%{_datadir}/packages/* %{_datadir}/scim/Anthy/* %{_libdir}/scim-1.0/1.4.0/IMEngine/* -- 2.7.4