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.

capture/GNUmakefile.in

@@ -34,11 +34,9 @@ capserver:	capserver.c capdecls.h
 #
 install:	all $(INSTALL_SBINDIR)/capserver
 
-real-install:	all $(INSTALL_SBINDIR)/capserver
-	install -s capture $(DESTDIR)/usr/site/bin
+real-install:	all $(INSTALL_SBINDIR)/capserver $(INSTALL_SBINDIR)/capture
 
-tipserv-install:	all
-	install -s capture $(DESTDIR)/usr/site/bin
+tipserv-install:	all $(INSTALL_SBINDIR)/capture
 
 clean:
 	rm -f *.o capture core errs Errs

rc.d/3.testbed.sh.in

@@ -22,9 +22,9 @@ if [ -x @prefix@/sbin/capserver  ]; then
         @prefix@/sbin/capserver
 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"
-	/usr/site/etc/capture.rc
+        @prefix@/etc/capture.rc
 fi
 
 if [ -x @prefix@/sbin/reload_daemon  ]; then