Index: common/Makefile
===================================================================
--- common/Makefile	(revision 7347)
+++ common/Makefile	(working copy)
@@ -66,7 +66,7 @@
 
 xymon.exe: xymon.c ../lib/strfunc.c ../lib/errormsg.c ../lib/environ.c ../lib/stackio.c ../lib/timefunc.c ../lib/memory.c ../lib/sendmsg.c ../lib/holidays.c ../lib/rbtr.c ../lib/msort.c
 	$(CC) $(CFLAGS) -c xymon.c 
-	$(CC) $(CFLAGS) -DXYMONTOPDIR=\"$(XYMONTOPDIR)\" -DXYMONLOGDIR=\"$(XYMONLOGDIR)\" -DXYMONHOSTNAME=\"$(XYMONHOSTNAME)\" -DXYMONHOSTIP=\"$(XYMONHOSTIP)\" -DXYMONHOSTOS=\"$(XYMONHOSTOS)\" -DBUILD_HOME=\"$(XYMONTOPDIR)/client\" -c ../lib/environ.c
+	$(CC) $(CFLAGS) -DXYMONTOPDIR=\"$(XYMONTOPDIR)\" -DXYMONLOGDIR=\"$(XYMONLOGDIR)\" -DXYMONHOSTNAME=\"$(XYMONHOSTNAME)\" -DXYMONHOSTIP=\"$(XYMONHOSTIP)\" -DXYMONHOSTOS=\"$(XYMONHOSTOS)\" -DXYMONHOME=\"$(XYMONHOME)\" -c ../lib/environ.c
 	$(CC) $(CFLAGS) -c ../lib/strfunc.c 
 	$(CC) $(CFLAGS) -c ../lib/errormsg.c
 	$(CC) $(CFLAGS) -c ../lib/stackio.c 
Index: configure.client
===================================================================
--- configure.client	(revision 7347)
+++ configure.client	(working copy)
@@ -137,9 +137,6 @@
 echo ""; echo ""
 
 XYMONHOSTOS=`uname -s | tr '[A-Z]' '[a-z]'`
-if test "$XYMONHOME" = ""; then
-	XYMONHOME=$XYMONTOPDIR/client
-fi
 
 echo "# Toplevel Makefile for Xymon"    > Makefile
 
@@ -156,8 +153,6 @@
 echo "#"                                 >>Makefile
 echo "# Toplevel dir"                    >>Makefile
 echo "XYMONTOPDIR = $XYMONTOPDIR"        >>Makefile
-echo "# Server home dir for etc/, www/"  >>Makefile
-echo "XYMONHOME = $XYMONHOME"            >>Makefile
 echo ""                                  >>Makefile
 echo "# Xymon settings follows"          >>Makefile
 echo "#"                                 >>Makefile
Index: build/Makefile.rules
===================================================================
--- build/Makefile.rules	(revision 7347)
+++ build/Makefile.rules	(working copy)
@@ -13,6 +13,8 @@
 ifeq ($(CLIENTONLY),yes)
 	BUILDTARGETS = client
 	CFLAGS += -DCLIENTONLY=1
+	XYMONCLIENTHOME = $(XYMONTOPDIR)
+	XYMONHOME = $(XYMONTOPDIR)
 ifeq ($(LOCALCLIENT),yes)
 	CLIENTTARGETS = lib-client common-client build-build xymond-client
 	INSTALLTARGETS = install-client install-localclient install-clientmsg
@@ -26,6 +28,8 @@
 	CLIENTTARGETS = lib-client common-client build-build
 	INSTALLTARGETS = install-xymongen install-xymonnet install-xymonproxy install-xymond install-web install-docs install-client install-servermsg
 	CFLAGS += $(PCREINCDIR)
+	XYMONCLIENTHOME = $(XYMONTOPDIR)/client
+	XYMONHOME = $(XYMONTOPDIR)/server
 endif
 
 ifndef INSTALLBINDIR
@@ -70,7 +74,7 @@
 	@echo ""
 
 client: include/config.h $(CLIENTTARGETS)
-	CC="$(CC)" CFLAGS="$(CFLAGS)" XYMONHOME="$(XYMONTOPDIR)/client" XYMONHOSTIP="$(XYMONHOSTIP)" LOCALCLIENT="$(LOCALCLIENT)" SSLLIBS="$(SSLLIBS)" NETLIBS="$(NETLIBS)" LIBRTDEF="$(LIBRTDEF)" $(MAKE) -C client all
+	CC="$(CC)" CFLAGS="$(CFLAGS)" XYMONHOME="$(XYMONCLIENTHOME)" XYMONHOSTIP="$(XYMONHOSTIP)" LOCALCLIENT="$(LOCALCLIENT)" SSLLIBS="$(SSLLIBS)" NETLIBS="$(NETLIBS)" LIBRTDEF="$(LIBRTDEF)" $(MAKE) -C client all
 
 include/config.h:
 	MAKE="$(MAKE)" CC="$(CC)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" $(BUILDTOPDIR)/build/genconfig.sh
@@ -79,16 +83,16 @@
 	CC="$(CC)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" RPATHOPT="$(RPATHOPT)" SSLLIBS="$(SSLLIBS)" NETLIBS="$(NETLIBS)" LIBRTDEF="$(LIBRTDEF)" XYMONHOME="$(XYMONHOME)" $(MAKE) -C build all
 
 lib-build: include/config.h
-	CC="$(CC)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" OSDEF="$(OSDEF)" RPATHOPT="$(RPATHOPT)" PCREINCDIR="$(PCREINCDIR)" ZLIBINCDIR="$(ZLIBINCDIR)" SSLFLAGS="$(SSLFLAGS)" SSLINCDIR="$(SSLINCDIR)" SSLLIBS="$(SSLLIBS)" NETLIBS="$(NETLIBS)" LIBRTDEF="$(LIBRTDEF)" XYMONTOPDIR="$(XYMONTOPDIR)" XYMONLOGDIR="$(XYMONLOGDIR)" XYMONHOSTNAME="$(XYMONHOSTNAME)" XYMONHOSTIP="$(XYMONHOSTIP)" XYMONHOSTOS="$(XYMONHOSTOS)" $(MAKE) -C lib all
+	CC="$(CC)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" OSDEF="$(OSDEF)" RPATHOPT="$(RPATHOPT)" PCREINCDIR="$(PCREINCDIR)" ZLIBINCDIR="$(ZLIBINCDIR)" SSLFLAGS="$(SSLFLAGS)" SSLINCDIR="$(SSLINCDIR)" SSLLIBS="$(SSLLIBS)" NETLIBS="$(NETLIBS)" LIBRTDEF="$(LIBRTDEF)" XYMONTOPDIR="$(XYMONTOPDIR)" XYMONHOME="$(XYMONHOME)" XYMONCLIENTHOME=$(XYMONCLIENTHOME) XYMONLOGDIR="$(XYMONLOGDIR)" XYMONHOSTNAME="$(XYMONHOSTNAME)" XYMONHOSTIP="$(XYMONHOSTIP)" XYMONHOSTOS="$(XYMONHOSTOS)" $(MAKE) -C lib all
 
 lib-client:
-	CC="$(CC)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" OSDEF="$(OSDEF)" RPATHOPT="$(RPATHOPT)" PCREINCDIR="$(PCREINCDIR)" ZLIBINCDIR="$(ZLIBINCDIR)" SSLFLAGS="$(SSLFLAGS)" SSLINCDIR="$(SSLINCDIR)" SSLLIBS="$(SSLLIBS)" NETLIBS="$(NETLIBS)" LIBRTDEF="$(LIBRTDEF)" XYMONTOPDIR="$(XYMONTOPDIR)" XYMONLOGDIR="$(XYMONLOGDIR)" XYMONHOSTNAME="$(XYMONHOSTNAME)" XYMONHOSTIP="$(XYMONHOSTIP)" XYMONHOSTOS="$(XYMONHOSTOS)" LOCALCLIENT="$(LOCALCLIENT)" $(MAKE) -C lib client
+	CC="$(CC)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" OSDEF="$(OSDEF)" RPATHOPT="$(RPATHOPT)" PCREINCDIR="$(PCREINCDIR)" ZLIBINCDIR="$(ZLIBINCDIR)" SSLFLAGS="$(SSLFLAGS)" SSLINCDIR="$(SSLINCDIR)" SSLLIBS="$(SSLLIBS)" NETLIBS="$(NETLIBS)" LIBRTDEF="$(LIBRTDEF)" XYMONTOPDIR="$(XYMONTOPDIR)" XYMONHOME="$(XYMONCLIENTHOME)" XYMONCLIENTHOME=$(XYMONCLIENTHOME) XYMONLOGDIR="$(XYMONLOGDIR)" XYMONHOSTNAME="$(XYMONHOSTNAME)" XYMONHOSTIP="$(XYMONHOSTIP)" XYMONHOSTOS="$(XYMONHOSTOS)" LOCALCLIENT="$(LOCALCLIENT)" $(MAKE) -C lib client
 
 common-build: lib-build
 	CC="$(CC)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" RPATHOPT="$(RPATHOPT)" SSLFLAGS="$(SSLFLAGS)" SSLINCDIR="$(SSLINCDIR)" SSLLIBS="$(SSLLIBS)" NETLIBS="$(NETLIBS)"  ZLIBLIBS="$(ZLIBLIBS)" LIBRTDEF="$(LIBRTDEF)" XYMONHOME="$(XYMONHOME)" $(MAKE) -C common all
 
 common-client: lib-client
-	CC="$(CC)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" RPATHOPT="$(RPATHOPT)" SSLFLAGS="$(SSLFLAGS)" SSLINCDIR="$(SSLINCDIR)" SSLLIBS="$(SSLLIBS)" NETLIBS="$(NETLIBS)"  ZLIBLIBS="$(ZLIBLIBS)" LIBRTDEF="$(LIBRTDEF)" XYMONHOME="$(XYMONHOME)" $(MAKE) -C common client
+	CC="$(CC)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" RPATHOPT="$(RPATHOPT)" SSLFLAGS="$(SSLFLAGS)" SSLINCDIR="$(SSLINCDIR)" SSLLIBS="$(SSLLIBS)" NETLIBS="$(NETLIBS)"  ZLIBLIBS="$(ZLIBLIBS)" LIBRTDEF="$(LIBRTDEF)" XYMONHOME="$(XYMONCLIENTHOME)" $(MAKE) -C common client
 
 xymongen-build: lib-build common-build
 	CC="$(CC)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" RPATHOPT="$(RPATHOPT)" SSLFLAGS="$(SSLFLAGS)" SSLINCDIR="$(SSLINCDIR)" SSLLIBS="$(SSLLIBS)" NETLIBS="$(NETLIBS)" LIBRTDEF="$(LIBRTDEF)" XYMONHOME="$(XYMONHOME)" XYMONVAR="$(XYMONVAR)" HISTGRAPHDEF="$(HISTGRAPHDEF)" RUNTIMEDEFS="$(RUNTIMEDEFS)" PCREINCDIR="$(PCREINCDIR)" PCRELIBS="$(PCRELIBS)" ZLIBINCDIR="$(ZLIBINCDIR)" ZLIBLIBS="$(ZLIBLIBS)" $(MAKE) -C xymongen all
@@ -345,7 +349,7 @@
 client-install: install-client
 
 install-client: client
-	XYMONHOME="$(XYMONTOPDIR)/client" INSTALLROOT="$(INSTALLROOT)" XYMONUSER="$(XYMONUSER)" IDTOOL="$(IDTOOL)" PKGBUILD="$(PKGBUILD)" LOCALCLIENT="$(LOCALCLIENT)" $(MAKE) -C client install
+	XYMONHOME="$(XYMONCLIENTHOME)" INSTALLROOT="$(INSTALLROOT)" XYMONUSER="$(XYMONUSER)" IDTOOL="$(IDTOOL)" PKGBUILD="$(PKGBUILD)" LOCALCLIENT="$(LOCALCLIENT)" $(MAKE) -C client install
 
 install-clientmsg:
 	@echo ""
@@ -354,5 +358,5 @@
 	@echo "To start the Xymon client, as the $(XYMONUSER) user run '${XYMONHOME}/runclient.sh start'"
 
 install-localclient:
-	XYMONHOME="$(XYMONTOPDIR)/client" INSTALLROOT="$(INSTALLROOT)" XYMONUSER="$(XYMONUSER)" LOCALCLIENT="$(LOCALCLIENT)" $(MAKE) -C client install-localclient
+	XYMONHOME="$(XYMONCLIENTHOME)" INSTALLROOT="$(INSTALLROOT)" XYMONUSER="$(XYMONUSER)" LOCALCLIENT="$(LOCALCLIENT)" $(MAKE) -C client install-localclient
 
Index: lib/Makefile
===================================================================
--- lib/Makefile	(revision 7347)
+++ lib/Makefile	(working copy)
@@ -79,10 +79,10 @@
 	$(CC) $(CFLAGS) `./test-endianness` -c -o $@ $<
 
 environ.o: environ.c
-	$(CC) $(CFLAGS) -DXYMONTOPDIR=\"$(XYMONTOPDIR)\" -DXYMONLOGDIR=\"$(XYMONLOGDIR)\" -DXYMONHOSTNAME=\"$(XYMONHOSTNAME)\" -DXYMONHOSTIP=\"$(XYMONHOSTIP)\" -DXYMONHOSTOS=\"$(XYMONHOSTOS)\" -DBUILD_HOME=\"$(XYMONTOPDIR)/server\" -c -o $@ environ.c
+	$(CC) $(CFLAGS) -DXYMONTOPDIR=\"$(XYMONTOPDIR)\" -DXYMONLOGDIR=\"$(XYMONLOGDIR)\" -DXYMONHOSTNAME=\"$(XYMONHOSTNAME)\" -DXYMONHOSTIP=\"$(XYMONHOSTIP)\" -DXYMONHOSTOS=\"$(XYMONHOSTOS)\" -DXYMONHOME=\"$(XYMONHOME)\" -c -o $@ environ.c
 
 environ-client.o: environ.c
-	$(CC) $(CFLAGS) -DXYMONTOPDIR=\"$(XYMONTOPDIR)\" -DXYMONLOGDIR=\"$(XYMONLOGDIR)\" -DXYMONHOSTNAME=\"$(XYMONHOSTNAME)\" -DXYMONHOSTIP=\"$(XYMONHOSTIP)\" -DXYMONHOSTOS=\"$(XYMONHOSTOS)\" -DBUILD_HOME=\"$(XYMONTOPDIR)/client\" -c -o $@ environ.c
+	$(CC) $(CFLAGS) -DXYMONTOPDIR=\"$(XYMONTOPDIR)\" -DXYMONLOGDIR=\"$(XYMONLOGDIR)\" -DXYMONHOSTNAME=\"$(XYMONHOSTNAME)\" -DXYMONHOSTIP=\"$(XYMONHOSTIP)\" -DXYMONHOSTOS=\"$(XYMONHOSTOS)\" -DXYMONHOME=\"$(XYMONCLIENTHOME)\" -c -o $@ environ.c
 
 color-client.o: color.c
 	$(CC) $(CFLAGS) -DCLIENTONLY -c -o $@ $<
Index: lib/environ.c
===================================================================
--- lib/environ.c	(revision 7347)
+++ lib/environ.c	(working copy)
@@ -36,7 +36,7 @@
 	{ "XYMONSERVERSECCGIURL", "/xymon-cgisecure" },
 	{ "XYMONNETWORK", "" },
 	{ "BBLOCATION", "" },
-	{ "PATH", "/bin:/usr/bin:/sbin:/usr/sbin:/usr/local/bin:/usr/local/sbin:"BUILD_HOME"/bin" },
+	{ "PATH", "/bin:/usr/bin:/sbin:/usr/sbin:/usr/local/bin:/usr/local/sbin:"XYMONHOME"/bin" },
 	{ "DELAYRED", "" },
 	{ "DELAYYELLOW", "" },
 	{ "XYMONDPORT", "1984" },
@@ -67,7 +67,7 @@
 	{ "XYMONSNAPURL", "$XYMONSERVERWWWURL/snap" },
 	{ "XYMONWAP", "$XYMONSERVERWWWURL/wml" },
 	{ "CGIBINURL", "$XYMONSERVERCGIURL" },
-	{ "XYMONHOME", BUILD_HOME },
+	{ "XYMONHOME", XYMONHOME },
 	{ "XYMONTMP", "$XYMONHOME/tmp" },
 	{ "HOSTSCFG", "$XYMONHOME/etc/hosts.cfg" },
 	{ "XYMON", "$XYMONHOME/bin/xymon" },
Index: configure.server
===================================================================
--- configure.server	(revision 7347)
+++ configure.server	(working copy)
@@ -375,9 +375,6 @@
 echo ""; echo ""
 
 XYMONHOSTOS=`uname -s | tr '[A-Z]' '[a-z]'`
-if test "$XYMONHOME" = ""; then
-	XYMONHOME=$XYMONTOPDIR/server
-fi
 if test "$XYMONVAR" = ""; then
 	XYMONVAR=$XYMONTOPDIR/data
 fi
@@ -401,8 +398,6 @@
 echo "#"                                 >>Makefile
 echo "# Toplevel dir"                    >>Makefile
 echo "XYMONTOPDIR = $XYMONTOPDIR"        >>Makefile
-echo "# Server home dir for etc/, bin/"  >>Makefile
-echo "XYMONHOME = $XYMONHOME"            >>Makefile
 echo "# Server data dir for hist/ etc."  >>Makefile
 echo "XYMONVAR = $XYMONVAR"              >>Makefile
 echo "# CGI scripts go in CGIDIR"        >>Makefile