# Add XYMONCLIENTHOME variable in the client environment, so it gets pulled
# in when running xymoncmd (and not just via the xymon-client init script.
# 

--- client/xymonclient.cfg.DIST.xymonclienthome	2010-11-06 03:50:05.000000000 -0700
+++ client/xymonclient.cfg.DIST	2011-01-31 11:51:18.882279387 -0800
@@ -8,6 +8,7 @@
 
 # You normally dont need to modify anything below here
 XYMONDPORT="1984"                   # Portnumber where xymond listens
+XYMONCLIENTHOME="@XYMONTOPDIR@/client" # Directory for the Xymon client files
 XYMONHOME="$XYMONCLIENTHOME"       # Directory for the Xymon client files
 XYMON="$XYMONHOME/bin/xymon"          # The Xymon client "xymon" utility
 XYMONTMP="$XYMONHOME/tmp"             # Where we may store temporary files.
--- client/Makefile.clienthome.patch	2011-03-17 13:48:31.148110000 -0700
+++ client/Makefile	2011-03-17 14:00:21.822561588 -0700
@@ -23,5 +23,5 @@
 
 xymonclient.cfg: xymonclient.cfg.DIST
-	cat xymonclient.cfg.DIST | sed -e 's!@XYMONHOSTIP@!$(XYMONHOSTIP)!g' >xymonclient.cfg
+	cat xymonclient.cfg.DIST | sed -e 's!@XYMONTOPDIR@!$(XYMONTOPDIR)!g' | sed -e 's!@XYMONHOSTIP@!$(XYMONHOSTIP)!g' >xymonclient.cfg
 	../build/bb-commands.sh >>xymonclient.cfg