Masafumi Yokoyama
null+****@clear*****
Fri Jun 26 17:12:07 JST 2015
Masafumi Yokoyama 2015-06-26 17:12:07 +0900 (Fri, 26 Jun 2015) New Revision: 03ea58497cfb9ee0c544a2ab2799f703f558f6b1 https://github.com/groonga/groonga/commit/03ea58497cfb9ee0c544a2ab2799f703f558f6b1 Message: rpm: use more meaningful conditional name * REDHAT_PLATFORM -> INSTALL_INIT_FILES * FEDORA_PLATFORM -> INSTALL_SYSTEMD_FILES Modified files: configure.ac data/init.d/redhat/Makefile.am data/init.d/redhat/sysconfig/Makefile.am data/logrotate.d/redhat/Makefile.am data/systemd/fedora/Makefile.am data/systemd/fedora/sysconfig/Makefile.am Modified: configure.ac (+2 -2) =================================================================== --- configure.ac 2015-06-26 16:54:30 +0900 (13fa8ca) +++ configure.ac 2015-06-26 17:12:07 +0900 (93aa4ef) @@ -1335,9 +1335,9 @@ AC_ARG_WITH(system-files, [install_system_files="no"]) AC_MSG_RESULT($install_system_files) -AM_CONDITIONAL([REDHAT_PLATFORM], +AM_CONDITIONAL([INSTALL_INIT_FILES], [test "${install_system_files}" = "init"]) -AM_CONDITIONAL([FEDORA_PLATFORM], +AM_CONDITIONAL([INSTALL_SYSTEMD_FILES], [test "${install_system_files}" = "systemd"]) # plugins check Modified: data/init.d/redhat/Makefile.am (+1 -1) =================================================================== --- data/init.d/redhat/Makefile.am 2015-06-26 16:54:30 +0900 (d63922a) +++ data/init.d/redhat/Makefile.am 2015-06-26 17:12:07 +0900 (380c1de) @@ -2,7 +2,7 @@ SUBDIRS = sysconfig scripts = groonga-server-http groonga-server-gqtp groonga-httpd -if REDHAT_PLATFORM +if INSTALL_INIT_FILES initdir = $(sysconfdir)/init.d dist_init_SCRIPTS = $(scripts) else Modified: data/init.d/redhat/sysconfig/Makefile.am (+1 -1) =================================================================== --- data/init.d/redhat/sysconfig/Makefile.am 2015-06-26 16:54:30 +0900 (44b47bb) +++ data/init.d/redhat/sysconfig/Makefile.am 2015-06-26 17:12:07 +0900 (2b5aca2) @@ -1,6 +1,6 @@ data = groonga-server-gqtp groonga-server-http groonga-httpd -if REDHAT_PLATFORM +if INSTALL_INIT_FILES sysconfigdir = $(sysconfdir)/sysconfig dist_sysconfig_DATA = $(data) else Modified: data/logrotate.d/redhat/Makefile.am (+1 -1) =================================================================== --- data/logrotate.d/redhat/Makefile.am 2015-06-26 16:54:30 +0900 (00d2c2e) +++ data/logrotate.d/redhat/Makefile.am 2015-06-26 17:12:07 +0900 (a405e61) @@ -1,7 +1,7 @@ logrotate_conf = groonga-server-gqtp groonga-server-http groonga-httpd -if REDHAT_PLATFORM +if INSTALL_INIT_FILES logrotatedir = $(sysconfdir)/logrotate.d dist_logrotate_DATA = $(logrotate_conf) else Modified: data/systemd/fedora/Makefile.am (+1 -1) =================================================================== --- data/systemd/fedora/Makefile.am 2015-06-26 16:54:30 +0900 (97caba3) +++ data/systemd/fedora/Makefile.am 2015-06-26 17:12:07 +0900 (dd7888e) @@ -5,7 +5,7 @@ services = \ groonga-server-gqtp.service \ groonga-httpd.service -if FEDORA_PLATFORM +if INSTALL_SYSTEMD_FILES unitdir = /usr/lib/systemd/system dist_unit_DATA = $(services) else Modified: data/systemd/fedora/sysconfig/Makefile.am (+1 -1) =================================================================== --- data/systemd/fedora/sysconfig/Makefile.am 2015-06-26 16:54:30 +0900 (5de8250) +++ data/systemd/fedora/sysconfig/Makefile.am 2015-06-26 17:12:07 +0900 (ac513eb) @@ -1,6 +1,6 @@ data = groonga-server-http groonga-server-gqtp -if FEDORA_PLATFORM +if INSTALL_SYSTEMD_FILES sysconfigdir = $(sysconfdir)/sysconfig dist_sysconfig_DATA = $(data) else -------------- next part -------------- HTML����������������������������...Descargar
