From 2534ecac4a691501baa2d304b321022b32c28d58 Mon Sep 17 00:00:00 2001
From: muench <muench>
Date: Wed, 29 Mar 2000 14:15:50 +0000
Subject: [PATCH] *** empty log message ***

---
 hadaq/hadaq_init.tcl |  4 ++--
 hadaq/makeenv        |  2 +-
 hadaq/soft.tcl       | 20 ++++++++++----------
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/hadaq/hadaq_init.tcl b/hadaq/hadaq_init.tcl
index 13edd37..8ad00ff 100644
--- a/hadaq/hadaq_init.tcl
+++ b/hadaq/hadaq_init.tcl
@@ -9,8 +9,8 @@ foreach i [agent cat] {
 
 	puts $host 
 	set hostType [ exec rsh $host uname ]
-	if {[string match "LynxOS" $hostType]} {
-		set psCmd {ps -ax | awk '{ print $1, $NF }'}
+	if {[string match "LynxOS" $hostType] || [string match "Linux" $hostType]} {
+		set psCmd {ps ax | awk '{ print $1, $NF }'}
 	} else {
 		set psCmd {export UNIX95=XPG4; ps -e -o pid -o comm}
 	}
diff --git a/hadaq/makeenv b/hadaq/makeenv
index 293d237..7f3d47b 100644
--- a/hadaq/makeenv
+++ b/hadaq/makeenv
@@ -33,7 +33,7 @@ elif test $HADAQ_CONF = "LINUX_NOATM"
 then
 	export CC="gcc"
 	export RPCGEN="rpcgen"
-	export LOADLIBES="-L$HOME/lib/$SYSTYPE -lhadesstd -llvme -ltk -L/usr/X11R6/lib -lX11 -ltcl -lm -ldl"
+	export LOADLIBES="-L$HOME/lib/$SYSTYPE -lhadesstd -llatm -llvme -ltk -L/usr/X11R6/lib -lX11 -ltcl -lm -ldl"
 	export INCLUDES="-I$HOME/include"
 	export DEFINES="-UNDEBUG -DHADESSTD_NEXITSTAT -DHADESSTD_NGETOPT -DNOATM"
 elif test $HADAQ_CONF = "LYNXOS"
diff --git a/hadaq/soft.tcl b/hadaq/soft.tcl
index 307eabd..76df3b0 100644
--- a/hadaq/soft.tcl
+++ b/hadaq/soft.tcl
@@ -1,12 +1,12 @@
-agent create acheron muench /home/muench/hdev/daq/hadaq
-agent create mimas muench /home/muench/hdev/daq/hadaq
-worker create acheron:evtbuild -a -p -2 -s 2 -m 1
-worker create acheron:netmem -a -p -1 -m 1 -i UDP:0.0.0.0:3000
-worker create mimas:memnet -a -p -1 -w 2500 -o UDP:129.187.154.22:3000
-worker create mimas:readout -a -p -2
+agent create localhost muench /home/muench/hdev/daq/hadaq
+agent create localhost muench /home/muench/hdev/daq/hadaq
+worker create localhost:evtbuild -a -p -2 -s 2 -m 1
+worker create localhost:netmem -a -p -1 -m 1 -i UDP:127.0.0.1:3000
+worker create localhost:memnet -a -p -1 -w 2500 -o UDP:127.0.0.1:3000
+worker create localhost:readout -a -p -2
 group create acquisition
 group create run
-group add acquisition mimas:memnet
-group add acquisition mimas:readout
-group add run acheron:evtbuild
-group add run acheron:netmem
+group add acquisition localhost:memnet
+group add acquisition localhost:readout
+group add run localhost:evtbuild
+group add run localhost:netmem
-- 
2.43.0