Commit bf862935 authored by Robert Ricci's avatar Robert Ricci
Browse files

Moved capture install target to @prefix@/sbin , so that it's kept with

all other testbed stuff. rc.d/3.testbed.sh now expects to find
capture in @prefix@/etc .

Also moved capserver out of the 'all' target in capture/GNUmakefile, so
that we don't try to build it on 'tipserv' machines, which won't have
the necessary mysql stuff.
parent 19b6d02e
...@@ -34,11 +34,9 @@ capserver: capserver.c capdecls.h ...@@ -34,11 +34,9 @@ capserver: capserver.c capdecls.h
# #
install: all $(INSTALL_SBINDIR)/capserver install: all $(INSTALL_SBINDIR)/capserver
real-install: all $(INSTALL_SBINDIR)/capserver real-install: all $(INSTALL_SBINDIR)/capserver $(INSTALL_SBINDIR)/capture
install -s capture $(DESTDIR)/usr/site/bin
tipserv-install: all tipserv-install: all $(INSTALL_SBINDIR)/capture
install -s capture $(DESTDIR)/usr/site/bin
clean: clean:
rm -f *.o capture core errs Errs rm -f *.o capture core errs Errs
...@@ -22,9 +22,9 @@ if [ -x @prefix@/sbin/capserver ]; then ...@@ -22,9 +22,9 @@ if [ -x @prefix@/sbin/capserver ]; then
@prefix@/sbin/capserver @prefix@/sbin/capserver
fi fi
if [ -x /usr/site/etc/capture.rc -a -d /var/log/tiplogs ]; then if [ -x @prefix@/etc/capture.rc -a -d /var/log/tiplogs ]; then
echo -n " capture" echo -n " capture"
/usr/site/etc/capture.rc @prefix@/etc/capture.rc
fi fi
if [ -x @prefix@/sbin/reload_daemon ]; then if [ -x @prefix@/sbin/reload_daemon ]; then
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment