===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/server.c,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -r1.109 -r1.110
--- src/usr.bin/tmux/server.c	2013/03/24 09:54:10	1.109
+++ src/usr.bin/tmux/server.c	2013/04/24 10:01:32	1.110
@@ -1,4 +1,4 @@
-/* $OpenBSD: server.c,v 1.109 2013/03/24 09:54:10 nicm Exp $ */
+/* $OpenBSD: server.c,v 1.110 2013/04/24 10:01:32 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -169,13 +169,13 @@
 	cfg_references = 1;
 	ARRAY_INIT(&cfg_causes);
 
-	if (access(SYSTEM_CFG, R_OK) == 0) {
-		if (load_cfg(SYSTEM_CFG, cfg_cmd_q, &cause) == -1) {
-			xasprintf(&cause, "%s: %s", SYSTEM_CFG, cause);
+	if (access(TMUX_CONF, R_OK) == 0) {
+		if (load_cfg(TMUX_CONF, cfg_cmd_q, &cause) == -1) {
+			xasprintf(&cause, "%s: %s", TMUX_CONF, cause);
 			ARRAY_ADD(&cfg_causes, cause);
 		}
 	} else if (errno != ENOENT) {
-		xasprintf(&cause, "%s: %s", SYSTEM_CFG, strerror(errno));
+		xasprintf(&cause, "%s: %s", TMUX_CONF, strerror(errno));
 		ARRAY_ADD(&cfg_causes, cause);
 	}
 	if (cfg_file != NULL) {