summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeng Wu <alexepico@gmail.com>2013-02-16 11:40:23 +0800
committerPeng Wu <alexepico@gmail.com>2013-02-16 12:55:50 +0800
commit8c8eabf8451c91635edf4cf48b20bc59210037ef (patch)
tree84a995ee99061094091e0bd7a88ba34f97a9a243
parentd30adf07184360c5c0ba9cb50bd9e021285de477 (diff)
downloadlibpinyin-8c8eabf8451c91635edf4cf48b20bc59210037ef.tar.gz
libpinyin-8c8eabf8451c91635edf4cf48b20bc59210037ef.tar.xz
libpinyin-8c8eabf8451c91635edf4cf48b20bc59210037ef.zip
move data files to libdir
-rw-r--r--data/Makefile.am2
-rw-r--r--libpinyin.pc.in3
-rw-r--r--libpinyin.spec.in2
3 files changed, 3 insertions, 4 deletions
diff --git a/data/Makefile.am b/data/Makefile.am
index f2564a5..e274473 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -30,7 +30,7 @@ EXTRA_DIST = $(textual_model_data)
libpinyin_db_DATA = $(binary_model_data)
-libpinyin_dbdir = $(pkgdatadir)/data
+libpinyin_dbdir = $(libdir)/libpinyin/data
CLEANFILES = $(binary_model_data)
diff --git a/libpinyin.pc.in b/libpinyin.pc.in
index 45c61c4..ea08282 100644
--- a/libpinyin.pc.in
+++ b/libpinyin.pc.in
@@ -2,8 +2,7 @@ prefix=@prefix@
exec_prefix=@exec_prefix@
libdir=@libdir@
includedir=@includedir@
-datadir=@datadir@
-pkgdatadir=@datadir@/libpinyin
+pkgdatadir=@libdir@/libpinyin
libpinyinincludedir=${includedir}/libpinyin-@VERSION@
libpinyin_binary_version=@LIBPINYIN_BINARY_VERSION@
diff --git a/libpinyin.spec.in b/libpinyin.spec.in
index c94a005..d75c5fd 100644
--- a/libpinyin.spec.in
+++ b/libpinyin.spec.in
@@ -8,7 +8,7 @@ URL: https://github.com/libpinyin/libpinyin
Source0: https://github.com/downloads/libpinyin/libpinyin/%{name}-%{version}.tar.gz
BuildRequires: db4-devel, glib2-devel
-Requires: %{name}-data = %{version}-%{release}
+Requires: %{name}-data%{?_isa} = %{version}-%{release}
%description
The libpinyin project aims to provide the algorithms core