HAYASHI Kentaro
null+****@clear*****
Tue Oct 23 16:59:15 JST 2012
HAYASHI Kentaro 2012-10-23 16:59:15 +0900 (Tue, 23 Oct 2012) New Revision: 2a7f9ba8afb04921c2eba1536bce41645e15ed0d https://github.com/groonga/groonga/commit/2a7f9ba8afb04921c2eba1536bce41645e15ed0d Log: deb rpm: change default install path of synonyms.tsv /usr/share/groonga -> /etc/groonga Modified files: configure.ac data/Makefile.am packages/debian/libgroonga0.install packages/rpm/centos/groonga.spec.in packages/rpm/fedora/groonga.spec.in Modified: configure.ac (+1 -1) =================================================================== --- configure.ac 2012-10-23 16:36:28 +0900 (491faaa) +++ configure.ac 2012-10-23 16:59:15 +0900 (dccbe9c) @@ -1185,7 +1185,7 @@ AC_DEFINE_UNQUOTED(GRN_QUERY_EXPANDER_TSV_RELATIVE_SYNONYMS_FILE, ["$GRN_QUERY_EXPANDER_TSV_RELATIVE_SYNONYMS_FILE"], "The relative synonyms file for TSV query expander") GRN_QUERY_EXPANDER_TSV_SYNONYMS_PATH="` - eval echo ${datarootdir}/${PACKAGE}/${GRN_QUERY_EXPANDER_TSV_RELATIVE_SYNONYMS_FILE} + eval echo ${sysconfdir}/${PACKAGE}/${GRN_QUERY_EXPANDER_TSV_RELATIVE_SYNONYMS_FILE} `" AC_DEFINE_UNQUOTED(GRN_QUERY_EXPANDER_TSV_SYNONYMS_FILE, ["$GRN_QUERY_EXPANDER_TSV_SYNONYMS_PATH"], Modified: data/Makefile.am (+2 -3) =================================================================== --- data/Makefile.am 2012-10-23 16:36:28 +0900 (5cd3ce8) +++ data/Makefile.am 2012-10-23 16:59:15 +0900 (96d1452) @@ -7,11 +7,10 @@ SUBDIRS = \ systemd \ scripts -dist_pkgdata_DATA = synonyms.tsv - pkgsysconfdir = $(sysconfdir)/$(PACKAGE) dist_pkgsysconf_DATA = \ - groonga.conf + groonga.conf \ + synonyms.tsv httpdconfdir = $(pkgsysconfdir)/httpd dist_httpdconf_DATA = \ Modified: packages/debian/libgroonga0.install (+1 -1) =================================================================== --- packages/debian/libgroonga0.install 2012-10-23 16:36:28 +0900 (3a996ed) +++ packages/debian/libgroonga0.install 2012-10-23 16:59:15 +0900 (193ae37) @@ -1,4 +1,4 @@ usr/lib/libgroonga*.so.* usr/lib/groonga/plugins/table/* usr/lib/groonga/plugins/query_expanders/* -usr/share/groonga/synonyms.tsv +etc/groonga/synonyms.tsv Modified: packages/rpm/centos/groonga.spec.in (+1 -1) =================================================================== --- packages/rpm/centos/groonga.spec.in 2012-10-23 16:36:28 +0900 (bd41db1) +++ packages/rpm/centos/groonga.spec.in 2012-10-23 16:59:15 +0900 (a239b00) @@ -276,7 +276,7 @@ fi %{_libdir}/groonga/plugins/table/table.so %{_libdir}/groonga/plugins/query_expanders/tsv.so %{_datadir}/groonga/ -%{_datadir}/groonga/synonyms.tsv +%config(noreplace) %{_sysconfdir}/groonga/synonyms.tsv %files server-common Modified: packages/rpm/fedora/groonga.spec.in (+1 -1) =================================================================== --- packages/rpm/fedora/groonga.spec.in 2012-10-23 16:36:28 +0900 (d896b30) +++ packages/rpm/fedora/groonga.spec.in 2012-10-23 16:59:15 +0900 (2128b39) @@ -326,7 +326,7 @@ fi %{_libdir}/groonga/plugins/table/table.so %{_libdir}/groonga/plugins/query_expanders/tsv.so %{_datadir}/groonga/ -%{_datadir}/groonga/synonyms.tsv +%config(noreplace) %{_sysconfdir}/groonga/synonyms.tsv %files server-common -------------- next part -------------- HTML����������������������������...Download