# Hard-code path to default configs for xymoncmd when --env is not specified
# instead of looking up $XYMONHOME

--- common/xymoncmd.c.homelesscmd	2010-11-06 03:50:05.000000000 -0700
+++ common/xymoncmd.c	2011-01-31 11:35:16.842559333 -0800
@@ -125,2 +125,6 @@
-		sprintf(envfn, "%s/etc/xymonserver.cfg", xgetenv("XYMONHOME"));
-		if (stat(envfn, &st) == -1) sprintf(envfn, "%s/etc/xymonclient.cfg", xgetenv("XYMONHOME"));
+		sprintf(envfn, "%s/etc/xymonserver.cfg", xgetenv("XYMONHOME"));
+		if (stat(envfn, &st) == -1) sprintf(envfn, "/etc/xymon/xymonserver.cfg");
+		if (stat(envfn, &st) == -1) sprintf(envfn, "/etc/xymon-client/xymonclient.cfg");
+		if (stat(envfn, &st) == -1) sprintf(envfn, "%s/etc/xymonclient.cfg", xgetenv("XYMONHOME"));
+		if (stat(envfn, &st) == -1) sprintf(envfn, "%s/etc/xymonclient.cfg", xgetenv("XYMONCLIENTHOME"));
+		if (stat(envfn, &st) == -1) sprintf(envfn, "xymonserver.cfg");