Merge pull request #192 from yamada-h/add-zk-control-to-package

Add zk_control to rpm/deb package
sheepdog · Nov 13, 2015 · 04fe301 · 04fe301
2 parents 0d76f38 + 3d1c33c
commit 04fe301
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/Makefile.am b/Makefile.am
@@ -67,6 +67,7 @@ RPMBUILD_REQ_OPTS =
 RPMBUILD_BUILD_REQ_OPTS =
 
 if BUILD_ZOOKEEPER
+RPMBUILDOPTS += --define "_have_zookeeper 1"
 RPMBUILD_CONFIG_OPTS += --enable-zookeeper
 RPMBUILD_BUILD_REQ_OPTS += zookeeper-native
 endif

diff --git a/sheepdog.spec.in b/sheepdog.spec.in
@@ -68,6 +68,9 @@ fi
 %{_sbindir}/sheepfs
 %{_bindir}/dog
 %{_sbindir}/shepherd
+%if 0%{_have_zookeeper}
+	%{_sbindir}/zk_control
+%endif
 %attr(755,-,-)%config %{_initddir}/sheepdog
 %dir %{_localstatedir}/lib/sheepdog
 %config %{_sysconfdir}/bash_completion.d/dog

diff --git a/tools/Makefile.am b/tools/Makefile.am
@@ -1,11 +1,13 @@
 MAINTAINERCLEANFILES	= Makefile.in
 
-noinst_PROGRAMS		=
+sbin_PROGRAMS		=
 
 if BUILD_ZOOKEEPER
-noinst_PROGRAMS		+= zk_control
+sbin_PROGRAMS		+= zk_control
 
 zk_control_SOURCES = zk_control.c
 
 zk_control_LDADD	= -lzookeeper_mt
 endif
+
+noinst_PROGRAMS		= $(sbin_PROGRAMS)