Bug 321940: [tcf][agent] The client isn't installed on "make install"

2 files changed, 6 insertions, 3 deletions

diff --git a/Makefile b/Makefile
index 98dd9b25..3ac233df 100644
--- a/Makefile
+++ b/Makefile
@@ -51,6 +51,7 @@ install: all
 	install -d -m 755 $(INSTALLROOT)$(INCLUDE)/tcf/framework
 	install -d -m 755 $(INSTALLROOT)$(INCLUDE)/tcf/services
 	install -c $(BINDIR)/agent -m 755 $(INSTALLROOT)$(SBIN)/tcf-agent
+	install -c $(BINDIR)/client -m 755 $(INSTALLROOT)$(SBIN)/tcf-client
 	install -c main/tcf-agent.init -m 755 $(INSTALLROOT)$(INIT)/tcf-agent
 	install -c config.h -m 755 $(INSTALLROOT)$(INCLUDE)/tcf/config.h
 	install -c -t $(INSTALLROOT)$(INCLUDE)/tcf/framework -m 644 framework/*.h
diff --git a/main/tcf-agent.spec b/main/tcf-agent.spec
index c3604dc9..bfa8650d 100644
--- a/main/tcf-agent.spec
+++ b/main/tcf-agent.spec
@@ -1,6 +1,7 @@
 %define name tcf-agent
 %define version 0.3.0
 %define release 1.%(bin/get-os-tag)
+%define make_options CONF=Release PATH_Plugins=/etc/tcf/plugins
 
 Name: %{name}
 Summary: Target Communication Framework agent
@@ -26,10 +27,10 @@ rm -rf $RPM_BUILD_ROOT
 %setup
 
 %build
-make all CONF=Release
+make %{make_options} all
 
 %install
-make install CONF=Release INSTALLROOT=$RPM_BUILD_ROOT SBIN=%{_sbindir} INCLUDE=%{_includedir}
+make %{make_options} install INSTALLROOT=$RPM_BUILD_ROOT SBIN=%{_sbindir} INCLUDE=%{_includedir}
 
 %clean
 [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
@@ -53,7 +54,8 @@ fi
 %files
 %defattr(-,root,root,0755)
 %config /etc/init.d/%{name}
-%{_sbindir}/%{name}
+%{_sbindir}/tcf-agent
+%{_sbindir}/tcf-client
 %{_includedir}/tcf
 
 %changelog